bitbake.conf: Allow TMPDIR and DEPLOY_DIR_IMAGE to be overridden

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f6cfe573e0bddc7c645390324b9ab582c68d71e9..81796dc524192268490a1e0ba9da3200ecdb5bc6 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -219,7 +219,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
 # General work and output directories for the build system.
 ##################################################################
 
-TMPDIR = "${TOPDIR}/tmp"
+TMPDIR ?= "${TOPDIR}/tmp"
 CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
 CO_DIR = "${DL_DIR}"
 CVSDIR = "${CO_DIR}/cvs"
@@ -266,7 +266,7 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
 DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
+DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images"
 DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"