summaryrefslogtreecommitdiff
path: root/conf/bitbake.conf
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-11-14 12:09:59 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2009-11-14 12:09:59 +0100
commitb32e9132c3b7186605a8f58978bf74dbcf12e1f7 (patch)
tree1a77746733e610166d0c0e30f6e1e65ecb74dac9 /conf/bitbake.conf
parente51de62ba9a8ee53f6df29ab682598348496ee66 (diff)
parent2c09164fd4c11832865f18b72f46266b7abffbc7 (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r--conf/bitbake.conf6
1 files changed, 4 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index e74b63e23e..ae3ff25f9d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -128,7 +128,7 @@ EXEEXT = "${HOST_EXEEXT}"
BASE_PACKAGE_ARCH = "${HOST_ARCH}"
PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
PACKAGE_EXTRA_ARCHS ?= ""
-MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
+MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
MULTIMACH_ARCH = "${PACKAGE_ARCH}"
@@ -338,6 +338,7 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
SDK_PATH = "/usr/local/${SDK_NAME}"
+SDKPATH = "${SDK_PATH}"
##################################################################
# Kernel info.
@@ -570,7 +571,8 @@ UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P $
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
SRCDATE = "${DATE}"
SRCREV = "1"
-AUTOREV = "${@bb.fetch.get_srcrev(d)}"
+SRCPV = "${@bb.fetch.get_srcrev(d)}"
+AUTOREV = "${SRCPV}"
SRC_URI = "file://${FILE}"