From e908ffe3cddd767cc1df4803e5ac8aed9f369bb1 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 30 Mar 2017 19:49:28 +0300 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt-native.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/recipes-devtools/quilt/quilt-native.inc') diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc index fce5fa1888..c7067042e6 100644 --- a/meta/recipes-devtools/quilt/quilt-native.inc +++ b/meta/recipes-devtools/quilt/quilt-native.inc @@ -5,8 +5,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1" inherit native PATCHTOOL = "patch" -EXTRA_OECONF = "--disable-nls" -EXTRA_OECONF_append_class-target = "--with-perl=perl" +EXTRA_OECONF_append = " --disable-nls" do_configure () { oe_runconf -- cgit v1.2.3-54-g00ecf