Skip to contentSkip to conversation

Buildhistory rebuilds fix

PATCH New Paul Eggleton 1 participant 3 messages Mar 3, 2014

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Buildhistory rebuilds fix

The following changes since commit 82c773e88aaefd9321481ad297554d5b4a3ae0b2:

Revert "ncurses: use ln -r to generate relative symlink" (2014-03-03 15:52:26 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-deps2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-deps2

Paul Eggleton (2):
bitbake.conf: add new vardepvalueexclude varflag to
BB_SIGNATURE_EXCLUDE_FLAGS
classes/buildhistory: fix task signatures changing

 meta/classes/buildhistory.bbclass | 6 ++++--
 meta/conf/bitbake.conf            | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.5.3
author
#1 lore raw

PATCH 1/2 bitbake.conf: add new vardepvalueexclude varflag to BB_SIGNATURE_EXCLUDE_FLAGS

We don't want the value of this varflag itself entering any signatures, ever.

Part of the fix for [YOCTO #5897].

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/conf/bitbake.conf +2 -2
index f81dea6..7291bf2 100644
@@ -773,8 +773,8 @@ 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"
 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 \
+    lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \
+    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"
Signature · 1 line
1.8.5.3
author
#2 lore raw

PATCH 2/2 classes/buildhistory: fix task signatures changing

In reply to Paul Eggleton

Fix task signatures for recipes that add to SSTATEPOSTINSTFUNCS changing when adding and removing INHERIT += "buildhistory" (really this time!)

This relies on the BitBake vardepvalueexclude feature, however it will not fail without it - signatures will be changed in that case though.

Part of the fix for [YOCTO #5897].

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/buildhistory.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/classes/buildhistory.bbclass +4 -2
index ef4135b..1a0e35d 100644
@@ -18,8 +18,10 @@ BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory <buildhistory@${DISTRO}>"
 BUILDHISTORY_PUSH_REPO ?= ""
 
 SSTATEPOSTINSTFUNCS += "buildhistory_emit_pkghistory"
-# We want to avoid influence the signatures of sstate tasks
-SSTATEPOSTINSTFUNCS[vardepvalue] := "${@d.getVar('SSTATEPOSTINSTFUNCS', False).replace(' buildhistory_emit_pkghistory', '')}"
+# We want to avoid influence the signatures of sstate tasks - first the function itself:
+sstate_install[vardepsexclude] += "buildhistory_emit_pkghistory"
+# then the value added to SSTATEPOSTINSTFUNCS:
+SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory"
 
 #
 # Write out metadata about this package for comparision when writing future packages
Signature · 1 line
1.8.5.3