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_0.65.bb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'meta/recipes-devtools/quilt/quilt_0.65.bb') diff --git a/meta/recipes-devtools/quilt/quilt_0.65.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb index 00f900a112..12859f0bcc 100644 --- a/meta/recipes-devtools/quilt/quilt_0.65.bb +++ b/meta/recipes-devtools/quilt/quilt_0.65.bb @@ -4,13 +4,3 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" SRC_URI += "file://aclocal.patch \ file://gnu_patch_test_fix_target.patch \ " - -# fix build-distro specific perl path in the target perl scripts -do_install_append() { - for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards - do - if [ -f $perlscript ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' $perlscript - fi - done -} -- cgit v1.2.3-54-g00ecf