From 40c95cb9def282dc88234cd72ff462d7a01e47c1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Nov 2014 17:45:07 +0000 Subject: siggen: Ensure we output if the ordering of runtaskdeps changes Order of runtaskdeps is important. If the hashes differ we should print output. This is complicated by shared work where the filenames themselves can differ, but the checksum should not. This fixes a case where two different checksums could show no output with bitbake-diffsigs. Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'lib/bb/siggen.py') diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 86d9ca059..1033785e0 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -307,6 +307,12 @@ def clean_basepaths(a): b[clean_basepath(x)] = a[x] return b +def clean_basepaths_list(a): + b = [] + for x in a: + b.append(clean_basepath(x)) + return b + def compare_sigfiles(a, b, recursecb = None): output = [] @@ -406,6 +412,17 @@ def compare_sigfiles(a, b, recursecb = None): for f in removed: output.append("Dependency on checksum of file %s was removed" % (f)) + changed = [] + for idx, task in enumerate(a_data['runtaskdeps']): + a = a_data['runtaskdeps'][idx] + b = b_data['runtaskdeps'][idx] + if a_data['runtaskhashes'][a] != b_data['runtaskhashes'][b]: + changed.append("%s with hash %s\n changed to\n%s with hash %s" % (a, a_data['runtaskhashes'][a], b, b_data['runtaskhashes'][b])) + + if changed: + output.append("runtaskdeps changed from %s to %s" % (clean_basepaths_list(a_data['runtaskdeps']), clean_basepaths_list(b_data['runtaskdeps']))) + output.append("\n".join(changed)) + if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data: a = a_data['runtaskhashes'] -- cgit 1.2.3-korg