summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Bulwahn <lukas.bulwahn@bmw-carit.de>2012-12-13 17:55:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-23 13:00:50 +0100
commit88de87eb4e8ee79815ca48cd592292950ac1cf56 (patch)
tree650ec9f454d6be966e58b90432b68a4395efb8f2
parent651658eac78d36f4de9a5a994f47b6888f343c68 (diff)
downloadpoky-88de87eb4e8ee79815ca48cd592292950ac1cf56.tar.gz
distutils: Replacing path to native python by path to python in the image to support python packages with console-script setup
When using distutils for a python package based on a python-setuptools installation script that sets up a console script, the header of the console script created by setuptools points to the python-native path. The console scripts are commonly executed in the image, but not in the sysroot environment. Therefore, the header of the console scripts should point to the python interpreter in the image. Setuptools does not allow to set the path of the python interpreter via some command-line argument. Hence after the installation script ran, the distutils class replaces the path in the console script files created by the installation. (From OE-Core rev: 55c6f1318fe62f7cec37776853cf8bef82a55f89) Signed-off-by: Lukas Bulwahn <Lukas.Bulwahn@oss.bmw-carit.de> sgw - added \ to protect the space. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/distutils.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index c73b24f273..3854849336 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -47,12 +47,14 @@ 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 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i 51 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
51 done 52 done
52 fi 53 fi
53 54
54 if test -e ${D}${sbindir}; then 55 if test -e ${D}${sbindir}; then
55 for i in ${D}${sbindir}/* ; do \ 56 for i in ${D}${sbindir}/* ; do \
57 sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
56 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i 58 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
57 done 59 done
58 fi 60 fi