diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-04-25 14:09:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:03:05 +0100 |
commit | f091895d7dacd601f52edb0f0a08bdfa7e6d2461 (patch) | |
tree | 5d1f6af3c833bf9b63dd80e07edd5b62776e0575 | |
parent | 555f2fc374728b3b379f2ad59c8c5fc34aeb194a (diff) | |
download | openembedded-core-f091895d7dacd601f52edb0f0a08bdfa7e6d2461.tar.gz openembedded-core-f091895d7dacd601f52edb0f0a08bdfa7e6d2461.tar.bz2 openembedded-core-f091895d7dacd601f52edb0f0a08bdfa7e6d2461.zip |
quilt: fix perl path in target perl scripts
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>
-rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.51.bb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/meta/recipes-devtools/quilt/quilt_0.51.bb b/meta/recipes-devtools/quilt/quilt_0.51.bb index 6865cd8738..4e51b49983 100644 --- a/meta/recipes-devtools/quilt/quilt_0.51.bb +++ b/meta/recipes-devtools/quilt/quilt_0.51.bb @@ -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 +} |