[oe-commits] [openembedded-core] 06/07: distutils.bbclass: Fix path to python for scripts

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0451f4ffcd854a00bce115dc9ce935c6633846a8
Author: Serhii Popovych <spopovyc at cisco.com>
AuthorDate: Tue Mar 28 19:31:59 2017 +0000

    distutils.bbclass: Fix path to python for scripts
    
    Commit 11229de (distutils: Replacing path to native python by path
    to python in the image to support python packages with
    console-script setup) replaces path to python-native with path
    to the python interpreter in the target image.
    
    However on nativesdk builds ${bindir} expanded to the
    ${SDKPATHNATIVE}${prefix_nativesdk} making shebang line
    pointing to the absolute path to env(1) in SDKPATHNATIVE
    which may not be present if coreutils isn't part of nativesdk.
    
    On the other hand commit cf63d90 (bitbake.conf: Define USRBINPATH
    globally instead of individually) introduces USRBINPATH variable
    which has correct value regarding build class and intended for
    this use case.
    
    v2: Rebased on top of new head.
    
    Cc: XE-Linux <xe-linux-external at cisco.com>
    Signed-off-by: Serhii Popovych <spopovyc at cisco.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/distutils.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index e5abdd1..1930c35 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -44,7 +44,7 @@ distutils_do_install() {
         if test -e ${D}${bindir} ; then	
             for i in ${D}${bindir}/* ; do \
                 if [ ${PN} != "${BPN}-native" ]; then
-                	sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
+			sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${USRBINPATH}/env\ python:g $i
 		fi
                 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
             done
@@ -53,7 +53,7 @@ distutils_do_install() {
         if [ -e ${D}${sbindir} ]; then
             for i in ${D}${sbindir}/* ; do \
                 if [ ${PN} != "${BPN}-native" ]; then
-                	sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${bindir}/env\ python:g $i
+			sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${USRBINPATH}/env\ python:g $i
 		fi
                 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
             done

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.