diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-18 17:38:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-18 22:18:52 +0100 |
commit | ac7a0311825e20c544d17bfd8be63546ad36e665 (patch) | |
tree | faf4f050bb8e629a5892f6eb7b0260583ca29451 /meta/recipes-devtools/quilt | |
parent | 63f545b850ea4118a7e9e412aa8a22206dc7da8c (diff) | |
download | poky-ac7a0311825e20c544d17bfd8be63546ad36e665.tar.gz |
bitbake.conf: Define USRBINPATH globally instead of individually
Many recipes are now having to define PERLPATH and PYTHONPATH variables.
Creating USRBINPATH in bitbake.conf means we can remove all these lines
from the many recipes now needing this and simplify the code changes
needed in each case, reducing the chance of errors being introduced.
Also fixup glib python binary location issue and fix function indentation.
(From OE-Core rev: cf63d9068c3a8c635dfc240d30dfff278be9b0e2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/quilt')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.60.bb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-devtools/quilt/quilt_0.60.bb b/meta/recipes-devtools/quilt/quilt_0.60.bb index 89c3f84f39..d866032188 100644 --- a/meta/recipes-devtools/quilt/quilt_0.60.bb +++ b/meta/recipes-devtools/quilt/quilt_0.60.bb | |||
@@ -9,15 +9,12 @@ PR = "r1" | |||
9 | 9 | ||
10 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash" | 10 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash" |
11 | 11 | ||
12 | PERLPATH = "${bindir}/env perl" | ||
13 | PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" | ||
14 | |||
15 | # fix build-distro specific perl path in the target perl scripts | 12 | # fix build-distro specific perl path in the target perl scripts |
16 | do_install_append() { | 13 | do_install_append() { |
17 | for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards | 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 |
18 | do | 15 | do |
19 | if [ -f $perlscript ]; then | 16 | if [ -f $perlscript ]; then |
20 | sed -i -e '1s,#!.*perl,#! ${PERLPATH},' $perlscript | 17 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' $perlscript |
21 | fi | 18 | fi |
22 | done | 19 | done |
23 | } | 20 | } |