summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 12:57:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-09 18:00:17 +0100
commit72500107b2a0533bb18d4915e0954c1494a499bb (patch)
treef658e07fbd0eaa52cab84d484ed4bfc372b1e5e3 /meta
parent3e4edfdfaeb1acda5079c16a70162f71dd339e85 (diff)
downloadpoky-72500107b2a0533bb18d4915e0954c1494a499bb.tar.gz
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] (From OE-Core rev: 4f6636be97e654c7f3d58e2649328b1dde8ef696) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d42cd55220..ee75c9b552 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 \
772 USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ 772 USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \
773 PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ 773 PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \
774 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX \ 774 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX \
775 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR" 775 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH"
776BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ 776BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
777 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ 777 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
778 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED" 778 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED"