diff options
| author | Rob Bradford <rob@linux.intel.com> | 2008-11-14 10:45:49 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-01 20:50:05 +0000 |
| commit | 49e8c06b777f5db4eb957c9bf27a8fdd2be714aa (patch) | |
| tree | 9d4cfa160305834481880272295f5ccfb3be03b7 /meta | |
| parent | f94ff9905535e4cd0157853bc57e1b6248029ad4 (diff) | |
| download | poky-49e8c06b777f5db4eb957c9bf27a8fdd2be714aa.tar.gz | |
bitbake.conf: Allow TMPDIR and DEPLOY_DIR_IMAGE to be overridden
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/bitbake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f6cfe573e0..81796dc524 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -219,7 +219,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" | |||
| 219 | # General work and output directories for the build system. | 219 | # General work and output directories for the build system. |
| 220 | ################################################################## | 220 | ################################################################## |
| 221 | 221 | ||
| 222 | TMPDIR = "${TOPDIR}/tmp" | 222 | TMPDIR ?= "${TOPDIR}/tmp" |
| 223 | CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" | 223 | CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" |
| 224 | CO_DIR = "${DL_DIR}" | 224 | CO_DIR = "${DL_DIR}" |
| 225 | CVSDIR = "${CO_DIR}/cvs" | 225 | CVSDIR = "${CO_DIR}/cvs" |
| @@ -266,7 +266,7 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" | |||
| 266 | DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" | 266 | DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" |
| 267 | DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" | 267 | DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" |
| 268 | DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" | 268 | DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" |
| 269 | DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" | 269 | DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images" |
| 270 | DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" | 270 | DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" |
| 271 | 271 | ||
| 272 | PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" | 272 | PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" |