diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-03-30 19:49:28 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-05 23:22:13 +0100 |
commit | e908ffe3cddd767cc1df4803e5ac8aed9f369bb1 (patch) | |
tree | d3bbfe036e2ba49953f0112e29b07ba555954ca3 /meta/recipes-devtools/quilt/quilt.inc | |
parent | 9cacf8488ca2f7de346ce3085d312ee017e4e39f (diff) | |
download | poky-e908ffe3cddd767cc1df4803e5ac8aed9f369bb1.tar.gz |
quilt: Fix paths for patch and perl
Currently some shebang lines end up as
#! /usr/bin/env perl -w
env does not like the argument. Also the current sed to insert env
does not cover the copies ptests use. Fix these issues by:
- using --with-perl to insert "env"
- Replacing "-w" in shebang lines with a new "use warning;" line
Remove a EXTRA_OECONF_append_class_target from the native recipe.
Don't overwrite EXTRA_OECONF in native: the values should be correct
for native as well.
--with-patch is used within the gnu patch wrapper only: before this
commit the wrapper contained a (build host) path to native patch.
Also tweak one test so busybox mv output is accepted.
All ptests should now pass: Fixes [YOCTO #11221].
(From OE-Core rev: 4b667d268fe410a21cacaecd1b5e3bfbbe7d53d8)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt.inc')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 57e2a14a4a..c7bb741b4c 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -8,6 +8,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ | |||
8 | file://run-ptest \ | 8 | file://run-ptest \ |
9 | file://Makefile \ | 9 | file://Makefile \ |
10 | file://test.sh \ | 10 | file://test.sh \ |
11 | file://0001-tests-Allow-different-output-from-mv.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" | 14 | SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" |
@@ -33,10 +34,16 @@ RDEPENDS_${PN} = "bash" | |||
33 | EXTRA_OE_MAKE_ARGS_darwin ?= "" | 34 | EXTRA_OE_MAKE_ARGS_darwin ?= "" |
34 | EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" | 35 | EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" |
35 | 36 | ||
36 | EXTRA_OECONF = "--with-perl=perl" | 37 | EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" |
37 | 38 | ||
38 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" | 39 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" |
39 | 40 | ||
41 | # Make sure we don't have "-w" in shebang lines: it breaks using | ||
42 | # "/usr/bin/env perl" as parser | ||
43 | do_configure_prepend () { | ||
44 | find ${S} -name "*.in" -exec sed -i -e "1s,^#\!.*@PERL@ -w$,#\! @PERL@\nuse warnings;," {} \; | ||
45 | } | ||
46 | |||
40 | # Don't setup symlinks to host utilities, we don't need them | 47 | # Don't setup symlinks to host utilities, we don't need them |
41 | do_configure_append () { | 48 | do_configure_append () { |
42 | sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile | 49 | sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile |