[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5405/8267] distutils3.bbclass: Fix path to python for scripts



commit 5156cdc36bf939d9e9c1c2e28366af781b1094fb
Author: Serhii Popovych <spopovyc cisco com>
Date:   Tue Mar 28 19:32:00 2017 +0000

    distutils3.bbclass: Fix path to python for scripts
    
    This change is similar to the recently introduced
    change to the distutils.bbclass fixing shebang
    line in python scripts for nativesdk class builds.
    
    v2: Rebased on top of new head.
    
    Cc: XE-Linux <xe-linux-external cisco com>
    (From OE-Core rev: 49772e1a1f291d1cacce27b381009dbb441c483e)
    
    Signed-off-by: Serhii Popovych <spopovyc cisco com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/distutils3.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index 01ef72a..6c30306 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -47,14 +47,14 @@ distutils3_do_install() {
 
         if test -e ${D}${bindir} ; then        
             for i in ${D}${bindir}/* ; do \
-                sed -i -e s:${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}:${bindir}/env\ 
${PYTHON_PN}:g $i
+                sed -i -e s:${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}:${USRBINPATH}/env\ 
${PYTHON_PN}:g $i
                 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-${PYTHON_PN}/${PYTHON_PN}:${bindir}/env\ 
${PYTHON_PN}:g $i
+                sed -i -e s:${STAGING_BINDIR_NATIVE}/python-${PYTHON_PN}/${PYTHON_PN}:${USRBINPATH}/env\ 
${PYTHON_PN}:g $i
                 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
             done
         fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]