summaryrefslogtreecommitdiff
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-18 10:01:33 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-18 10:01:33 +0100
commit1d4f93e8f63395220da652bae055acde11544577 (patch)
treeed0bd7716f87bd755b1bd6b1b73814970386f1e4 /meta/conf/bitbake.conf
parent8aa3e16e1f88a2327fe1da6cdc4c3e0bd480a815 (diff)
downloadopenembedded-core-1d4f93e8f63395220da652bae055acde11544577.tar.gz
openembedded-core-1d4f93e8f63395220da652bae055acde11544577.tar.bz2
openembedded-core-1d4f93e8f63395220da652bae055acde11544577.zip
Add SDKMACHINE to simplify SDK control and add to CACHE paths to allow environmental variable control
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r--meta/conf/bitbake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4437fa7008..77b0a4f8e8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -232,7 +232,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
##################################################################
TMPDIR ?= "${TOPDIR}/tmp"
-CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
+CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}"
# The persistent cache should be shared by all builds
PERSISTENT_DIR = "${TMPDIR}/cache"
CO_DIR = "${DL_DIR}"
@@ -604,6 +604,7 @@ include conf/local.conf
include conf/build/${BUILD_SYS}.conf
include conf/target/${TARGET_SYS}.conf
include conf/machine/${MACHINE}.conf
+include conf/machine-sdk/${SDKMACHINE}.conf
include conf/distro/${DISTRO}.conf
include conf/documentation.conf
require conf/sanity.conf