From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 29 Jul 2007 22:20:41 +0000 (+0000)
Subject: image.bbclass: Use system python explicitly, don't use python-native version
X-Git-Tag: Release-2010-05/1~8868^2~66^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d57b6bc2f95d8f569db46aa9fb6e02540aa7e46;p=openembedded.git

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

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 5f1dfa2dce..05bc9d669b 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -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}/
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 328125e0b4..e305dc3251 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -246,6 +246,7 @@ export RANLIB = "${HOST_PREFIX}ranlib"
 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}"