From 1d4f93e8f63395220da652bae055acde11544577 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Sep 2009 10:01:33 +0100 Subject: Add SDKMACHINE to simplify SDK control and add to CACHE paths to allow environmental variable control Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/conf/bitbake.conf') 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 -- cgit v1.2.3-54-g00ecf