diff options
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9f77c82e06..d2be2cb1e4 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -143,7 +143,6 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" | |||
143 | 143 | ||
144 | TMPDIR = "${TOPDIR}/tmp" | 144 | TMPDIR = "${TOPDIR}/tmp" |
145 | CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" | 145 | CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" |
146 | DL_DIR ?= "${TMPDIR}/downloads" | ||
147 | CVSDIR = "${DL_DIR}/cvs" | 146 | CVSDIR = "${DL_DIR}/cvs" |
148 | SVNDIR = "${DL_DIR}/svn" | 147 | SVNDIR = "${DL_DIR}/svn" |
149 | GITDIR = "${DL_DIR}/git" | 148 | GITDIR = "${DL_DIR}/git" |
@@ -420,6 +419,7 @@ require conf/sanity.conf | |||
420 | # Weak variables (usually to retain backwards compatibility) | 419 | # Weak variables (usually to retain backwards compatibility) |
421 | ################################################################## | 420 | ################################################################## |
422 | 421 | ||
422 | DL_DIR ?= "${TMPDIR}/downloads" | ||
423 | IMAGE_FSTYPES ?= "jffs2" | 423 | IMAGE_FSTYPES ?= "jffs2" |
424 | PCMCIA_MANAGER ?= "pcmcia-cs" | 424 | PCMCIA_MANAGER ?= "pcmcia-cs" |
425 | MACHINE_TASK_PROVIDER ?= "task-bootstrap" | 425 | MACHINE_TASK_PROVIDER ?= "task-bootstrap" |