summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-06-18 18:55:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:03:03 +0100
commitd0c615e51e57435034ffba5e55a17fae833c6688 (patch)
tree8b5514c5a859cbff7588bb1d9b9b205c3ff5ce83 /meta/conf
parent66123b92557a7c1d63c29e90d9a8ba4ef146fc8a (diff)
downloadpoky-d0c615e51e57435034ffba5e55a17fae833c6688.tar.gz
conf/bitbake.conf: fix reparsing after -p is used
The bitbake wrapper script is set up such that the -p (--parse-only) command line option is not executed under pseudo, and it sets the PSEUDO_BUILD variable to indicate whether or not pseudo is being used. Since PSEUDO_BUILD is allowed through into the environment via BB_ENV_EXTRAWHITE it influences the data hash and thus if you run "bitbake -p" and then run bitbake again to actually build something, the change to PSEUDO_BUILD causes the cache from the -p execution not to be used. This is fixed simply by adding PSEUDO_BUILD to BB_HASHCONFIG_WHITELIST in bitbake.conf so that it doesn't influence the data hash. Fixes [YOCTO #2600]. (From OE-Core rev: 1e50225df2d6b5f10c5648703282235a11b1efb3) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 face25e80c..b6fbc7aff1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -750,7 +750,7 @@ BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
750# Setup our default hash policy 750# Setup our default hash policy
751BB_SIGNATURE_HANDLER ?= "OEBasic" 751BB_SIGNATURE_HANDLER ?= "OEBasic"
752BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST PRSERV_PORT PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE" 752BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST PRSERV_PORT PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE"
753BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK XAUTHORITY" 753BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK XAUTHORITY PSEUDO_BUILD"
754BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends lockfiles type vardepsexclude \ 754BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends lockfiles type vardepsexclude \
755 vardeps vardepvalue file-checksums python func task export unexport noexec \ 755 vardeps vardepvalue file-checksums python func task export unexport noexec \
756 nostamp dirs cleandirs sstate-lockfile-shared prefuncs postfuncs export_func \ 756 nostamp dirs cleandirs sstate-lockfile-shared prefuncs postfuncs export_func \