From 49e8c06b777f5db4eb957c9bf27a8fdd2be714aa Mon Sep 17 00:00:00 2001
From: Rob Bradford <rob@linux.intel.com>
Date: Fri, 14 Nov 2008 10:45:49 +0000
Subject: bitbake.conf: Allow TMPDIR and DEPLOY_DIR_IMAGE to be overridden

---
 meta/conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'meta/conf')

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f6cfe573e..81796dc52 100644
--- 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}"
-- 
cgit v1.2.3