From bc2b60c021e0bc4403021ae2739869c073189794 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 6 Feb 2013 23:34:52 +0000 Subject: 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 --- meta/conf/bitbake.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta/conf') 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 \ USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE" -BB_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 BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ - PARALLEL_MAKE BB_NUMBER_THREADS" +BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ + SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ + PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV" BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends \ lockfiles type vardepsexclude vardeps vardepvalue file-checksums python \ func task export unexport noexec nostamp dirs cleandirs \ -- cgit v1.2.3-54-g00ecf