]> code.ossystems Code Review - openembedded-core.git/commitdiff
quilt: fix perl path in target perl scripts
authorNitin A Kamble <nitin.a.kamble@intel.com>
Wed, 25 Apr 2012 21:09:14 +0000 (14:09 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 26 Apr 2012 09:03:05 +0000 (10:03 +0100)
While building on distros like fedora17, which has /bin/perl,
the target perl scripts get perl path also as /bin/perl.
And that is not correction path of perl on the target.

This commit avoids this error.

| error: Failed dependencies:
|       /bin/perl is needed by quilt-0.51-r2.i586
NOTE: package core-image-sato-sdk-1.0-r0: task do_rootfs: Failed
ERROR: Task 8
(/home/nitin/prj/poky.git/meta/recipes-sato/images/core-image-sato-sdk.bb,
do_rootfs) failed with exit code '1'

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
meta/recipes-devtools/quilt/quilt_0.51.bb

index 6865cd8738a8e7b54c6b07b0113df8ad9e22d8d9..4e51b499837dccd64ec924023c55814619b5ceba 100644 (file)
@@ -4,4 +4,17 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
 SRC_URI += "file://aclocal.patch \
             file://gnu_patch_test_fix_target.patch \
            "
-PR = "r3"
+PR = "r4"
+
+PERLPATH = "${bindir}/env perl"
+PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
+
+# 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,#! ${PERLPATH},' $perlscript
+               fi
+       done
+}