From 50629b3746c149b22bdd8664842a4c69abb2b989 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Mon, 19 Jul 2010 11:31:40 +0100
Subject: [PATCH] bitbake.conf: move PSTAGE_DIR and DL_DIR with build output

Having PSTAGE_DIR be a top level directory by default doesn't make sense, move
it to be a child of the build directory so that it lives with all other built
output. Also move DL_DIR to a child of the build directory for the use case of
an unwriteable $OEROOT.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 build/conf/local.conf.sample | 10 ++++++----
 meta/conf/bitbake.conf       |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index e58c476a7d..32bd409ecc 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -1,10 +1,12 @@
 # CONF_VERSION is increased each time build/conf/ changes incompatibly
 CONF_VERSION = "1"
 
-# Where to cache the files Poky downloads
-DL_DIR ?= "${OEROOT}/sources"
-# Where to cache Poky's built staging output
-PSTAGE_DIR ?= "${OEROOT}/pstage"
+# Uncomment and change to cache the files Poky downloads in an alternative
+# location, default it ${TOPDIR}/sources
+#DL_DIR ?= "${TOPDIR}/sources"
+# Uncomment and change to cache Poky's built staging output in an alternative
+# location, default ${TOPDIR}/pstage
+#PSTAGE_DIR ?= "${TOPDIR}/pstage"
 
 # Uncomment and set to allow bitbake to execute multiple tasks at once.
 # For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ab91b932c4..daf978025c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -626,8 +626,8 @@ require conf/abi_version.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
-DL_DIR ?= "${TMPDIR}/downloads"
-PSTAGE_DIR ?= "${TMPDIR}/pstage"
+DL_DIR ?= "${TOPDIR}/downloads"
+PSTAGE_DIR ?= "${TOPDIR}/pstage"
 IMAGE_FSTYPES ?= "tar.gz"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"