Skip to contentSkip to conversation

Allow exclusion of variable value portions from signatures

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

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Allow exclusion of variable value portions from signatures

The following change since commit 8239264753977bd06ad5b1b574245d3842af489b:

fetch2: Drop svk fetcher (2014-03-02 17:23:30 +0000)

is available in the git repository at:

git://git.yoctoproject.org/poky-contrib paule/vardepvalueexclude
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/vardepvalueexclude

Paul Eggleton (1):
data: add vardepvalueexclude varflag

 lib/bb/data.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.5.3
author
#1 lore raw

PATCH 1/1 data: add vardepvalueexclude varflag

On rare occasions it's useful to be able to exclude a part of a variable's value from the variable's signature; for example if you want to add an item to a list sometimes and not have the signature of the variable change depending on whether the item is in the list or not. The initial intended use case for this in OpenEmbedded is to allow adding a function to SSTATEPOSTINSTFUNCS in buildhistory.bbclass and not have that change any task signatures (so adding and removing INHERIT += "buildhistory" won't lead to any rebuilds).

Part of the fix for [YOCTO #5897].

Signed-off-by Paul Eggleton <[email protected]>
---
 lib/bb/data.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
lib/bb/data.py +7 -1
index a56b79c..db938be 100644
@@ -295,7 +295,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
             deps |= parser.references
             deps = deps | (keys & parser.execs)
             return deps, value
-        varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "postfuncs", "prefuncs"]) or {}
+        varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "vardepvalueexclude", "postfuncs", "prefuncs"]) or {}
         vardeps = varflags.get("vardeps")
         value = d.getVar(key, False)
 

@@ -345,6 +345,12 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
             deps = deps | (keys & parser.execs)
             value = handle_contains(value, parser.contains, d)
 
+        if "vardepvalueexclude" in varflags:
+            exclude = varflags.get("vardepvalueexclude")
+            for excl in exclude.split('|'):
+                if excl:
+                    value = value.replace(excl, '')
+
         # Add varflags, assuming an exclusion list is set
         if varflagsexcl:
             varfdeps = []
Signature · 1 line
1.8.5.3