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-26 16:37:55 +0100
commitc54076ed8ae5c82d13a7edf4a14cbc1bb6eac658 (patch)
treeadd4acac91ddbad49125e3894ad029f677bc672d /meta/classes
parente58266dd3ba04137f33c819bbc15d8215a1b1ede (diff)
downloadpoky-c54076ed8ae5c82d13a7edf4a14cbc1bb6eac658.tar.gz
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. (From OE-Core rev: 312b6b33dca565153bc2e92d7ff6dd2974db4edb) 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() {
47 47
48 if test -e ${D}${bindir} ; then 48 if test -e ${D}${bindir} ; then
49 for i in ${D}${bindir}/* ; do \ 49 for i in ${D}${bindir}/* ; do \
50 sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i 50 if [ ${PN} != "${BPN}-native" ]; then
51 sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
52 fi
51 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i 53 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
52 done 54 done
53 fi 55 fi
54 56
55 if test -e ${D}${sbindir}; then 57 if test -e ${D}${sbindir}; then
56 for i in ${D}${sbindir}/* ; do \ 58 for i in ${D}${sbindir}/* ; do \
57 sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i 59 if [ ${PN} != "${BPN}-native" ]; then
60 sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
61 fi
58 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i 62 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
59 done 63 done
60 fi 64 fi