diff options
| author |   Matthew McClintock <msm@freescale.com> | 2011-11-30 11:24:55 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 16:17:38 +0000 |
| commit | 71b53a3f0766ca464560a1f6a449f9424fbdf7ae (patch) | |
| tree | 7d3eea6f760096997deb6456afdc51eeba50bc8f | |
| parent | 24e99460800856035bb54a84c7aa33b3517436e9 (diff) | |
| download | bitbake-71b53a3f0766ca464560a1f6a449f9424fbdf7ae.tar.gz | |
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
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/siggen.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 8d768cea7..22417b9cd 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -236,13 +236,13 @@ def compare_sigfiles(a, b): p2 = pickle.Unpickler(file(b, "rb")) b_data = p2.load() - def dict_diff(a, b): + def dict_diff(a, b, whitelist=set()): sa = set(a.keys()) sb = set(b.keys()) common = sa & sb changed = set() for i in common: - if a[i] != b[i]: + if a[i] != b[i] and i not in whitelist: changed.add(i) added = sa - sb removed = sb - sa @@ -262,7 +262,7 @@ def compare_sigfiles(a, b): if 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: 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]) |