From: Paul Eggleton Date: Mon, 3 Mar 2014 15:45:57 +0000 (+0000) Subject: classes/buildhistory: fix task signatures changing X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=229bcde8e445344bd6906cc8fab0088123ba6add;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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]. (From OE-Core rev: 27c8a9a282358b9a8a330252ee2104b250777b38) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index ef4135b1fd4..1a0e35d58b6 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -18,8 +18,10 @@ BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory " 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