[oe-commits] Richard Purdie : bitbake.conf: Add BUILD_ARCH and SSTATE_PKGARCH to HASHBASE whitelist

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 4f6636be97e654c7f3d58e2649328b1dde8ef696
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4f6636be97e654c7f3d58e2649328b1dde8ef696

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Jul  8 12:57:39 2015 +0100

bitbake.conf: Add BUILD_ARCH and SSTATE_PKGARCH to HASHBASE whitelist

As Chris Larson points out in the bug, "BUILD_ARCH changing doesn't change
native/cross sstate checksums, because its calculated in ${@}, so just its
unexpanded form is in the signature. But BUILD_ARCH ends up included in the
sstate filenames, so changes to BUILD_ARCH will result in rebuilds of
native/cross but not rebuilds of the target recipes which depend on
them, which is just what we want."

However it does mean we can't easily test 32 and 64 bit signatures. In order
to make the tests work, we need to add BUILD_ARCH to the HASHBASE whitelist.
BUILD_ARCH is used in the workdir paths and so on so changing it does still
rebuild when we need it to.

With improvements to function dependency tracking, a dependency on SSTATE_PKGARCH
was also introduced causing problems for 32/64 bit build signature equivalence.
Since this is reflected in the sstate filenames, we can safely whitelist this too.

[YOCTO #5970]

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 d42cd55..ee75c9b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -772,7 +772,7 @@ 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 LICENSE_PATH SDKPKGSUFFIX \
-    WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR"
+    WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH"
 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_INVALIDCONF BBINCLUDED"