From fe6bd219f936e49942894e6bde877efe231a3e6c Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Sat, 19 Mar 2016 19:06:10 +0900 Subject: parted.morph: Remove the perl requirement from bootstrap.conf The gnulib bootstrap script is idiotic, when it does get_version(), it looks for a string v${major}.${minor}.${micro}... it starts this by taking the last 'v' on the line and removing everything else. On an arm arch, instead of getting 5.22.0 from the (v5.22.0) string output from perl --version... it gets 5tejl-linux from the armv5tejl-linux string on the same line... get_version() thus thinks we have "perl 5" and breaks. This is not a problem for armv7lhf builds, because the bootstrap script conveniently interprets perl's version as perl version 7, which is newer than the required 5.6. Change-Id: I1445cfd84efd37c1828eae09def88b27f18af250 --- strata/tools/parted.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/tools/parted.morph b/strata/tools/parted.morph index 86d74da6..0f279950 100644 --- a/strata/tools/parted.morph +++ b/strata/tools/parted.morph @@ -3,6 +3,7 @@ kind: chunk build-system: autotools pre-configure-commands: - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf +- sed -i -e '/^buildreq="/,/^"/{/perl/d}' bootstrap.conf - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib configure-commands: # Disable device-mapper as it is not installed on Baserock -- cgit v1.2.1