summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2013-09-22 04:31:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-25 17:48:13 +0100
commit312b6b33dca565153bc2e92d7ff6dd2974db4edb (patch)
tree1afdc6c6f1f53efeb777d27f6021777169884a57 /meta/classes
parent2cc9106da45a14d41a5269d91d7f79b6ccd8597f (diff)
downloadopenembedded-core-312b6b33dca565153bc2e92d7ff6dd2974db4edb.tar.gz
openembedded-core-312b6b33dca565153bc2e92d7ff6dd2974db4edb.tar.bz2
openembedded-core-312b6b33dca565153bc2e92d7ff6dd2974db4edb.zip
distutils: Replacing path to native path only to be done to non-native python packages
distutils: Replacing path to native path only to be done to non-native python packages distutils: Replacing path to native python by path to python in the image to support python packages with console-script setup resulted in a "bad interpreter" error message because coreutils-native is not a specified dependency of a number of native python packages. We modify the change to apply specifically to non-native packages. Signed-off-by: Amy Fong <Amy.Fong@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/distutils.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index a0e1f502fd..8c3a979322 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -47,14 +47,18 @@ distutils_do_install() {
if test -e ${D}${bindir} ; then
for i in ${D}${bindir}/* ; do \
- sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
+ if [ ${PN} != "${BPN}-native" ]; then
+ sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
+ fi
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi
if test -e ${D}${sbindir}; then
for i in ${D}${sbindir}/* ; do \
- sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
+ if [ ${PN} != "${BPN}-native" ]; then
+ sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
+ fi
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi