summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-03-19 19:06:10 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-03-20 20:21:20 +0900
commit73fb47f70c95b62138a4c59a80464a58dde200ae (patch)
tree90f2aa53d012ae874da361e3cc69a3b1f0a2b0d1
parent573655dec823abc934388ef68012cf1e2d047c8d (diff)
downloaddefinitions-73fb47f70c95b62138a4c59a80464a58dde200ae.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.
-rw-r--r--strata/tools/parted.morph1
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