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:05:20 +0100 |
commit | e3a6524579f84569889edf267cf9753e2d9bc95c (patch) | |
tree | 200f8d73841d4a20a013779bd5a2f3db7f76bef5 /meta | |
parent | c2b663f5f8d783ad7de5106d8d91434ee76b9e1a (diff) | |
download | poky-e3a6524579f84569889edf267cf9753e2d9bc95c.tar.gz |
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'
(From OE-Core rev: f091895d7dacd601f52edb0f0a08bdfa7e6d2461)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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" | |||
4 | SRC_URI += "file://aclocal.patch \ | 4 | SRC_URI += "file://aclocal.patch \ |
5 | file://gnu_patch_test_fix_target.patch \ | 5 | file://gnu_patch_test_fix_target.patch \ |
6 | " | 6 | " |
7 | PR = "r3" | 7 | PR = "r4" |
8 | |||
9 | PERLPATH = "${bindir}/env perl" | ||
10 | PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" | ||
11 | |||
12 | # fix build-distro specific perl path in the target perl scripts | ||
13 | do_install_append() { | ||
14 | for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards | ||
15 | do | ||
16 | if [ -f $perlscript ]; then | ||
17 | sed -i -e '1s,#!.*perl,#! ${PERLPATH},' $perlscript | ||
18 | fi | ||
19 | done | ||
20 | } | ||