aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-03-03 15:45:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:49:22 +0000
commit27c8a9a282358b9a8a330252ee2104b250777b38 (patch)
tree856f09ec7f2b188ce66a27aa986090a26b5f6d39 /meta
parent1497d3d4b10844aa19ce6dcceed25aa36454160f (diff)
downloadopenembedded-core-contrib-27c8a9a282358b9a8a330252ee2104b250777b38.tar.gz
classes/buildhistory: fix task signatures changing
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 <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/buildhistory.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index ef4135b1fd..1a0e35d58b 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -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