From a0a3a442409aef9495c0547ed268f6132862a5a2 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 21 Aug 2012 18:08:29 +0100 Subject: [PATCH] conf/bitbake.conf: allow cache reuse between bitbake, bitbake-layers and hob BB_ENV_EXTRAWHITE is set by the bitbake wrapper script but not by bitbake-layers, and thus it was affecting the data hash and thus invalidating the cache. Any variables passed through from the environment by being added to this variable should themselves influence the hash already if they are not already excluded from, the data hash, so BB_ENV_EXTRAWHITE can be excluded. Similarly, DISABLE_SANITY_CHECKS is set by the hob script in order to have sanity checks run later, but not set by the bitbake wrapper script. It doesn't actually affect the build itself and so its value can also be excluded from the data hash. These changes prevent unnecessary reparsing between executions of bitbake, bitbake-layers, and the initial pseudo build within the hob script. Fixes [YOCTO #2680]. (From OE-Core rev: 84bcacd5b4737520f0fc76333f0165ef5b87c207) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index bc2d47dc4f..ad98756bc9 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -762,7 +762,7 @@ BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log" # Setup our default hash policy BB_SIGNATURE_HANDLER ?= "OEBasicHash" BB_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" -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_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" 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 sstate-lockfile-shared prefuncs postfuncs export_func \