siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed
Some BB_HASHBASE_WHITELIST variables are in the lists of variable dependencies for signatures. Ignore those differences in lists since this difference does not matter (Bitbake rev: 71b53a3f0766ca464560a1f6a449f9424fbdf7ae) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
f204d16012
commit
23c6b49566
|
@ -236,13 +236,13 @@ def compare_sigfiles(a, b):
|
||||||
p2 = pickle.Unpickler(file(b, "rb"))
|
p2 = pickle.Unpickler(file(b, "rb"))
|
||||||
b_data = p2.load()
|
b_data = p2.load()
|
||||||
|
|
||||||
def dict_diff(a, b):
|
def dict_diff(a, b, whitelist=set()):
|
||||||
sa = set(a.keys())
|
sa = set(a.keys())
|
||||||
sb = set(b.keys())
|
sb = set(b.keys())
|
||||||
common = sa & sb
|
common = sa & sb
|
||||||
changed = set()
|
changed = set()
|
||||||
for i in common:
|
for i in common:
|
||||||
if a[i] != b[i]:
|
if a[i] != b[i] and i not in whitelist:
|
||||||
changed.add(i)
|
changed.add(i)
|
||||||
added = sa - sb
|
added = sa - sb
|
||||||
removed = sb - sa
|
removed = sb - sa
|
||||||
|
@ -262,7 +262,7 @@ def compare_sigfiles(a, b):
|
||||||
if a_data['basehash'] != b_data['basehash']:
|
if a_data['basehash'] != b_data['basehash']:
|
||||||
print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash'])
|
print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash'])
|
||||||
|
|
||||||
changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'])
|
changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist'])
|
||||||
if changed:
|
if changed:
|
||||||
for dep in changed:
|
for dep in changed:
|
||||||
print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])
|
print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])
|
||||||
|
|
Loading…
Reference in New Issue