Patchwork conf/bitbake.conf: allow cache reuse between bitbake, bitbake-layers and hob

login
register
mail settings
Submitter Paul Eggleton
Date Aug. 21, 2012, 5:08 p.m.
Message ID <1345568909-10802-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/35079/
State Accepted
Commit 84bcacd5b4737520f0fc76333f0165ef5b87c207
Headers show

Comments

Paul Eggleton - Aug. 21, 2012, 5:08 p.m.
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].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/conf/bitbake.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Richard Purdie - Aug. 22, 2012, 1:05 p.m.
On Tue, 2012-08-21 at 18:08 +0100, Paul Eggleton wrote:
> 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].
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/conf/bitbake.conf |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index bc2d47d..ad98756 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 \