diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 12:42:27 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 12:46:00 +0000 |
| commit | 520f7b5b0994d72967e7bef52b8b177d306dbdee (patch) | |
| tree | 156128106b99b3fc16e2e44e1f10b4278e9f9a83 /meta/recipes-devtools | |
| parent | 7cffb5b8a8d3b314bf228c8737bb738feb91ad72 (diff) | |
| download | ast2050-yocto-poky-520f7b5b0994d72967e7bef52b8b177d306dbdee.zip ast2050-yocto-poky-520f7b5b0994d72967e7bef52b8b177d306dbdee.tar.gz | |
gnu-config: Only apply path transformations in the non-native/non-nativesdk case
The BUILD_ARCH != TARGET_ARCH check isn't a safe one to detect native builds
and doesn't cover the nativesdk case. This converts the recipe to use PN
instead which is more accurate and ensures the correct entries making it
into the correct packages.
(From OE-Core rev: 4a601314604e8428d9dace95c32a71a57eacaaf5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config_20111111.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb index 0c652c2..d4588da 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb @@ -28,7 +28,7 @@ do_install () { sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet - if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then + if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi chmod 755 ${D}${bindir}/gnu-configize diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 0fdee66..4de4799 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -29,7 +29,7 @@ do_install () { sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet - if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then + if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi chmod 755 ${D}${bindir}/gnu-configize |
