diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2016-03-19 19:06:10 +0900 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2016-03-24 15:47:32 +0000 |
| commit | fe6bd219f936e49942894e6bde877efe231a3e6c (patch) | |
| tree | 788253829d86f9d3806c649b185a778be2f9a9c1 | |
| parent | 556b39ee83be5a0dfbd5c6a727c168e2b15c650a (diff) | |
| download | infrastructure-fe6bd219f936e49942894e6bde877efe231a3e6c.tar.gz | |
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
| -rw-r--r-- | strata/tools/parted.morph | 1 |
1 files changed, 1 insertions, 0 deletions
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 |