| Submitter | Paul Eggleton |
|---|---|
| Date | June 18, 2012, 5:55 p.m. |
| Message ID | <1340042156-25187-1-git-send-email-paul.eggleton@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/30061/ |
| State | Accepted |
| Commit | 1e50225df2d6b5f10c5648703282235a11b1efb3 |
| Headers | show |
Comments
On 06/18/2012 10:55 AM, Paul Eggleton wrote: > The bitbake wrapper script is set up such that the -p (--parse-only) > command line option is not executed under pseudo, and it sets the > PSEUDO_BUILD variable to indicate whether or not pseudo is being used. > Since PSEUDO_BUILD is allowed through into the environment via > BB_ENV_EXTRAWHITE it influences the data hash and thus if you run > "bitbake -p" and then run bitbake again to actually build something, the > change to PSEUDO_BUILD causes the cache from the -p execution not to be > used. This is fixed simply by adding PSEUDO_BUILD to > BB_HASHCONFIG_WHITELIST in bitbake.conf so that it doesn't influence the > data hash. > > Fixes [YOCTO #2600]. > > Signed-off-by: Paul Eggleton<paul.eggleton@linux.intel.com> > --- > 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 97930a7..12598f4 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -746,7 +746,7 @@ 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 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" > +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_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 \ Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 97930a7..12598f4 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -746,7 +746,7 @@ 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 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" +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_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 \
The bitbake wrapper script is set up such that the -p (--parse-only) command line option is not executed under pseudo, and it sets the PSEUDO_BUILD variable to indicate whether or not pseudo is being used. Since PSEUDO_BUILD is allowed through into the environment via BB_ENV_EXTRAWHITE it influences the data hash and thus if you run "bitbake -p" and then run bitbake again to actually build something, the change to PSEUDO_BUILD causes the cache from the -p execution not to be used. This is fixed simply by adding PSEUDO_BUILD to BB_HASHCONFIG_WHITELIST in bitbake.conf so that it doesn't influence the data hash. Fixes [YOCTO #2600]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)