From patchwork Thu Aug 16 06:46:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2,V3] bitbake.conf: add STAMPS_DIR for constructing STAMP Date: Thu, 16 Aug 2012 06:46:18 -0000 From: Robert Yang X-Patchwork-Id: 34687 Message-Id: To: Cc: Zhenfeng.Zhao@windriver.com Add STAMPS_DIR for constructing STAMP, the defination of STAMP is: STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF} We can only change the TMPDIR if we want to change the STAMP's location, but the cache would be regenerated if TMPDIR changed, so add STAMPS_DIR for constructing it, and add it to the BB_ENV_EXTRAWHITE, this is very usefull for the "bitbake -S", since then it can be run by: STAMPS_DIR= bitbake -S which will avoid putting the stamps to ${TMPDIR}/stamps. BTW, break the too long BB_ENV_EXTRAWHITE into several lines. [YOCTO #1659] Signed-off-by: Robert Yang --- meta/conf/bitbake.conf | 3 ++- scripts/oe-buildenv-internal | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8074684..653ba98 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -332,7 +332,8 @@ GITDIR = "${CO_DIR}/git2" BZRDIR = "${CO_DIR}/bzr" HGDIR = "${CO_DIR}/hg" -STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" +STAMPS_DIR ?= "${TMPDIR}/stamps" +STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" T = "${WORKDIR}/temp" D = "${WORKDIR}/image" diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 32c0ba0..098d474 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -75,4 +75,7 @@ unset BITBAKEDIR # Used by the runqemu script export BUILDDIR export PATH -export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER SCREENDIR" +export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy + https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY + SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE + SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"