summaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/bitbake.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 66c6901c7d..c99dc2cff2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -151,7 +151,6 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
151 151
152TMPDIR = "${TOPDIR}/tmp" 152TMPDIR = "${TOPDIR}/tmp"
153CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 153CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
154DL_DIR = "${TMPDIR}/downloads"
155CVSDIR = "${DL_DIR}/cvs" 154CVSDIR = "${DL_DIR}/cvs"
156SVNDIR = "${DL_DIR}/svn" 155SVNDIR = "${DL_DIR}/svn"
157GITDIR = "${DL_DIR}/git" 156GITDIR = "${DL_DIR}/git"
@@ -469,6 +468,7 @@ require conf/sanity.conf
469# Weak variables (usually to retain backwards compatibility) 468# Weak variables (usually to retain backwards compatibility)
470################################################################## 469##################################################################
471 470
471DL_DIR ?= "${TMPDIR}/downloads"
472IMAGE_FSTYPES ?= "jffs2" 472IMAGE_FSTYPES ?= "jffs2"
473PCMCIA_MANAGER ?= "pcmcia-cs" 473PCMCIA_MANAGER ?= "pcmcia-cs"
474MACHINE_TASK_PROVIDER ?= "task-base" 474MACHINE_TASK_PROVIDER ?= "task-base"