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.f...@windriver.com>
---
meta/classes/distutils.bbclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 60cf9ee..fbe0ec8 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
--
1.7.12.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
