summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
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
144TMPDIR = "${TOPDIR}/tmp" 144TMPDIR = "${TOPDIR}/tmp"
145CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 145CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
146DL_DIR ?= "${TMPDIR}/downloads"
147CVSDIR = "${DL_DIR}/cvs" 146CVSDIR = "${DL_DIR}/cvs"
148SVNDIR = "${DL_DIR}/svn" 147SVNDIR = "${DL_DIR}/svn"
149GITDIR = "${DL_DIR}/git" 148GITDIR = "${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
422DL_DIR ?= "${TMPDIR}/downloads"
423IMAGE_FSTYPES ?= "jffs2" 423IMAGE_FSTYPES ?= "jffs2"
424PCMCIA_MANAGER ?= "pcmcia-cs" 424PCMCIA_MANAGER ?= "pcmcia-cs"
425MACHINE_TASK_PROVIDER ?= "task-bootstrap" 425MACHINE_TASK_PROVIDER ?= "task-bootstrap"