From patchwork Wed Nov 30 07:55:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed Date: Wed, 30 Nov 2011 07:55:07 -0000 From: Matthew McClintock X-Patchwork-Id: 15769 Message-Id: <1322639707-7798-2-git-send-email-msm@freescale.com> To: 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 --- I'm seeing variables in BB_HASHBASE_WHITELIST make it to the signature. Not sure if they are used to calculate the hash but assuming they are not we don't need to print out that they are different bitbake/lib/bb/siggen.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 9231291..bb909ba 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -237,13 +237,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 @@ -263,7 +263,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])