[oe-commits] org.oe.dev image.bbclass: Use system python explicitly, don't use python-native version

[rpurdie commit]

image.bbclass: Use system python explicitly, don't use python-native version

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 0a0e903f871cbfe8af458c92a00295ec9000e61e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0a0e903f871cbfe8af458c92a00295ec9000e61e
Files:
1
classes/image.bbclass
conf/bitbake.conf
Diffs:

#
# mt diff -r2690bc18adf57e32539aef7f2be9eff39beeb308 -r0a0e903f871cbfe8af458c92a00295ec9000e61e
#
# 
# 
# patch "classes/image.bbclass"
#  from [cf408c603e14de57c839124bce87cc2ffce1d4cb]
#    to [b12f7deb7eeb24775346b8b0b0fd5410bc002f6b]
# 
# patch "conf/bitbake.conf"
#  from [65c6664182f52edf3011a54f0b1b6d85f137b7da]
#    to [cb6550c833966af0deba898eb3e14cf54b4bd8c8]
# 
============================================================
--- classes/image.bbclass	cf408c603e14de57c839124bce87cc2ffce1d4cb
+++ classes/image.bbclass	b12f7deb7eeb24775346b8b0b0fd5410bc002f6b
@@ -91,7 +91,7 @@ fakeroot do_rootfs () {
 		if test -z "$FAKEROOTKEY"; then
 			fakeroot -i ${TMPDIR}/fakedb.image bbimage -t $type -e ${FILE}
 		else
-			bbimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}"
+			${PYTHON} `which bbimage` -n "${IMAGE_NAME}" -t "$type" -e "${FILE}"
 		fi
 
 		cd ${DEPLOY_DIR_IMAGE}/
============================================================
--- conf/bitbake.conf	65c6664182f52edf3011a54f0b1b6d85f137b7da
+++ conf/bitbake.conf	cb6550c833966af0deba898eb3e14cf54b4bd8c8
@@ -246,6 +246,7 @@ export OBJDUMP = "${HOST_PREFIX}objdump"
 export STRIP = "${HOST_PREFIX}strip"
 export OBJCOPY = "${HOST_PREFIX}objcopy"
 export OBJDUMP = "${HOST_PREFIX}objdump"
+PYTHON = "${@sys.executable}"
 
 export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
 export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"