Patchwork [1/2] bitbake.conf: Move default hash policy initialization before conf file inclusion

login
register
mail settings
Submitter Jason Wessel
Date May 14, 2012, 4:09 p.m.
Message ID <1337011770-24297-2-git-send-email-jason.wessel@windriver.com>
Download mbox | patch
Permalink /patch/27645/
State New
Headers show

Comments

Jason Wessel - May 14, 2012, 4:09 p.m.
It is desirable to be able to augment the default hash policy from
local.conf if adding new exported variables that do not impact the end
result of a build, and in order to do this the default initialization
must occur prior to the conf file inclusion.

This is an example of a change that should not impact the sstate sum
that an end user might change in the local.conf.

export CCACHE_DISABLE = "1"
BB_HASHBASE_WHITELIST += "CCACHE_DISABLE"

There are a myriad of reasons you might set this ranging from
debugging a ccache issue to the desire to never construct the ccache
at all, either way the end result of the binaries produced is always
the same.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
---
 meta/conf/bitbake.conf |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index dc68690..12bca0e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -653,6 +653,11 @@  MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
 CPU_FEATURES ?= ""
 CPU_FEATURES_arm ?= "vfp"
 
+# Setup our default hash policy
+BB_SIGNATURE_HANDLER ?= "OEBasic"
+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"
+BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK XAUTHORITY"
+
 ##################################################################
 # Include the rest of the config files.
 ##################################################################
@@ -744,10 +749,5 @@  TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
 # Complete output from bitbake, if you're changing it, make sure to use existing directory
 BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
 
-# Setup our default hash policy
-BB_SIGNATURE_HANDLER ?= "OEBasic"
-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"
-BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK XAUTHORITY"
-
 MLPREFIX ??= ""
 MULTILIB_VARIANTS ??= ""