summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-06 23:34:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-06 23:37:10 +0000
commitbc2b60c021e0bc4403021ae2739869c073189794 (patch)
tree73f5c2a37f7326440a77f2b411792ae8cf33df6b /meta/conf
parent43bc21462bcf4eb46deae1a0f51f44a8ff920083 (diff)
downloadpoky-bc2b60c021e0bc4403021ae2739869c073189794.tar.gz
bitbake.conf: Update hashconfig after BB_ORIGENV changes
We should ignore BB_ORIGENV from the hash for the config data. There are also a number of variables which no longer make it into the data store so we can drop these from the hash whitelist. (From OE-Core rev: cb21af00f9321ea48e533089dbffbb1a9665cb92) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 223c03fab7..5f4a41227a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -774,10 +774,9 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
774 USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ 774 USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \
775 PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ 775 PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \
776 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE" 776 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE"
777BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER \ 777BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
778 DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK \ 778 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
779 XAUTHORITY PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ 779 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV"
780 PARALLEL_MAKE BB_NUMBER_THREADS"
781BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends \ 780BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends \
782 lockfiles type vardepsexclude vardeps vardepvalue file-checksums python \ 781 lockfiles type vardepsexclude vardeps vardepvalue file-checksums python \
783 func task export unexport noexec nostamp dirs cleandirs \ 782 func task export unexport noexec nostamp dirs cleandirs \