* [PATCH 1/2] bitbake.conf: break three very long lines
2012-10-23 7:52 [PATCH 0/2] bitbake.conf: modify BB_HASHBASE_WHITELIST and BB_HASHCONFIG_WHITELIST Robert Yang
@ 2012-10-23 7:52 ` Robert Yang
2012-10-23 7:52 ` [PATCH 2/2] bitbake.conf: add BUILDNAME to BB_HASHBASE_WHITELIST Robert Yang
2012-10-25 20:06 ` [PATCH 0/2] bitbake.conf: modify BB_HASHBASE_WHITELIST and BB_HASHCONFIG_WHITELIST Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Robert Yang @ 2012-10-23 7:52 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
Break the following 3 very long lines into 3 pieces, make a line under
80 characters, will modify BB_HASHBASE_WHITELIST and
BB_HASHCONFIG_WHITELIST in the next patch:
BB_HASHBASE_WHITELIST
BB_HASHCONFIG_WHITELIST
BB_SIGNATURE_EXCLUDE_FLAGS
[YOCTO #3299]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/conf/bitbake.conf | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6fe924c..65efbb9 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -770,12 +770,20 @@ 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 CCACHE_DISABLE"
-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 PARALLEL_MAKE BB_NUMBER_THREADS"
-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 \
- deptask rdeptask recrdeptask nodeprrecs stamp-base stamp-extra-info"
+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 CCACHE_DISABLE"
+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 \
+ PARALLEL_MAKE BB_NUMBER_THREADS"
+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 deptask rdeptask \
+ recrdeptask nodeprrecs stamp-base stamp-extra-info"
MLPREFIX ??= ""
MULTILIB_VARIANTS ??= ""
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] bitbake.conf: add BUILDNAME to BB_HASHBASE_WHITELIST
2012-10-23 7:52 [PATCH 0/2] bitbake.conf: modify BB_HASHBASE_WHITELIST and BB_HASHCONFIG_WHITELIST Robert Yang
2012-10-23 7:52 ` [PATCH 1/2] bitbake.conf: break three very long lines Robert Yang
@ 2012-10-23 7:52 ` Robert Yang
2012-10-25 20:06 ` [PATCH 0/2] bitbake.conf: modify BB_HASHBASE_WHITELIST and BB_HASHCONFIG_WHITELIST Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Robert Yang @ 2012-10-23 7:52 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
There is an error when "bitbake -S <image>", e.g., core-image-minimal:
NOTE: Reparsing files to collect dependency data
ERROR: Bitbake's cached basehash does not match the one we just generated (/path/to/meta/recipes-core/images/core-image-minimal.bb.do_rootfs)!
ERROR: The mismatched hashes were 730202c9538c4fc1f2e3d1fefa3595f0 and a91bb9451c182e19bfe405ac1bafcc0f
The mismatch can be caused by 2 reasons:
1) BUILDNAME, there is no member of BUILDNAME in the cache when first
parsing the recipes, it is added by the BBCooker::buildSetVars before
start the building, so there would be mismatches when compare the
re-parsed basehash (contains BUILDNAME) to the previous one (no
BUILDNAME) which is from the cache.
Add the BUILDNAME to BB_HASHBASE_WHITELIST would fix the problem.
2) DATE or TIME, they are in the cache data and will change when
re-parsing, move them from BB_HASHCONFIG_WHITELIST to
BB_HASHBASE_WHITELIST which can be ingored by basehash would fix the
problem.
Another fix for DATE or TIME is not to let them expand immediately,
change: (":=" to "=")
DATE := "${@time.strftime('%Y%m%d',time.gmtime())}"
TIME := "${@time.strftime('%H%M%S',time.gmtime())}"
To:
DATE = "${@time.strftime('%Y%m%d',time.gmtime())}"
TIME = "${@time.strftime('%H%M%S',time.gmtime())}"
[YOCTO #3299]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/conf/bitbake.conf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 65efbb9..41c27eb 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -774,8 +774,8 @@ 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 CCACHE_DISABLE"
-BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER \
+ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE DATE TIME BUILDNAME"
+BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} SESSION_MANAGER \
DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK \
XAUTHORITY PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
PARALLEL_MAKE BB_NUMBER_THREADS"
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] bitbake.conf: modify BB_HASHBASE_WHITELIST and BB_HASHCONFIG_WHITELIST
2012-10-23 7:52 [PATCH 0/2] bitbake.conf: modify BB_HASHBASE_WHITELIST and BB_HASHCONFIG_WHITELIST Robert Yang
2012-10-23 7:52 ` [PATCH 1/2] bitbake.conf: break three very long lines Robert Yang
2012-10-23 7:52 ` [PATCH 2/2] bitbake.conf: add BUILDNAME to BB_HASHBASE_WHITELIST Robert Yang
@ 2012-10-25 20:06 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2012-10-25 20:06 UTC (permalink / raw)
To: Robert Yang; +Cc: Zhenfeng.Zhao, openembedded-core
On 10/23/2012 12:52 AM, Robert Yang wrote:
> Test Info:
>
> $ bitbake core-image-minimal core-image-sato meta-toolchain
> meta-toolchain-sdk adt-installer meta-ide-support
>
> Questions:
> What's the rule about whether a variable should be in
> BB_HASHBASE_WHITELIST or BB_HASHCONFIG_WHITELIST, please ?
>
> // Robert
>
> The following changes since commit 60a26d24964832ce390b4c1f0d134b744dc9201b:
>
> documentation: yocto-project-qs - Final changes before the 1.3 lockdown (2012-10-23 00:03:14 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib robert/bbs
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/bbs
>
> Robert Yang (2):
> bitbake.conf: break three very long lines
Merged into OE-Core
> bitbake.conf: add BUILDNAME to BB_HASHBASE_WHITELIST
>
Richard is looking at this one, it likely has issues that are not as
obvious on first look.
Thanks
Sau!
> meta/conf/bitbake.conf | 20 ++++++++++++++------
> 1 files changed, 14 insertions(+), 6 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 4+ messages in thread