siggen: compare runtaskdeps dictionary even when they have the same size
* otherwise it reports lots of changed checksums just because it compares different tasks notice linux-libc-headers_3.1.bb.do_package_write: Task dependency hash changed from 42acced29debf54d598802474c5e9cbb to f438a54f995df77620d0727d6f4b4ce5 (for linux-libc-headers_3.1.bb.do_package_write and linux-gta04_git.bb.do_deploy) Task dependency hash changed from 61f8babe1d10c6e7fb1423112bb04e1e to 1b3e21ff106ecfcb7ddf76a1e29537bb (for linux-nokia900-meego_git.bb.do_deploy and linux-gta04_git.bb.do_package_write) Task dependency hash changed from 512f9d6686d760b318d8b11c8b589226 to 42acced29debf54d598802474c5e9cbb (for linux-nokia900-meego_git.bb.do_package_write and linux-libc-headers_3.1.bb.do_package_write) Task dependency hash changed from 153e91dfd1d2053fda7b98cc08d4b802 to 92a293bdd8ed234932b87a66025038c5 (for systemd-serialgetty.bb.do_package_write and systemd-serialgetty.bb.do_package_write) Task dependency hash changed from 730abebf9954794bb440c2f3239f79fe to 413eaebaff27a2fd16f5cf68c1f4ff17 (for systemd_git.bb.do_package_write and systemd_git.bb.do_package_write) with this patch: Dependency on task linux-nokia900-meego_git.bb.do_package_write was added Dependency on task linux-nokia900-meego_git.bb.do_deploy was added Dependency on task linux-gta04_git.bb.do_deploy was removed Dependency on task linux-gta04_git.bb.do_package_write was removed Hash for dependent task systemd_git.bb.do_package_write changed from 730abebf9954794bb440c2f3239f79fe to 413eaebaff27a2fd16f5cf68c1f4ff17 Hash for dependent task systemd-serialgetty.bb.do_package_write changed from 153e91dfd1d2053fda7b98cc08d4b802 to 92a293bdd8ed234932b87a66025038c5 * added test if there is different task with same hash then we don't show it as added/removed dependency, because bitbake doesn't care (Bitbake rev: ca52bf32b479811bd7fed41648bedcc06b00430b) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e228289bf0
commit
8e0c7b3c0d
|
@ -295,27 +295,32 @@ def compare_sigfiles(a, b):
|
||||||
print "Variable %s value changed from %s to %s" % (dep, a_data['varvals'][dep], b_data['varvals'][dep])
|
print "Variable %s value changed from %s to %s" % (dep, a_data['varvals'][dep], b_data['varvals'][dep])
|
||||||
|
|
||||||
if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data:
|
if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data:
|
||||||
if len(a_data['runtaskdeps']) != len(b_data['runtaskdeps']):
|
a = clean_basepaths(a_data['runtaskhashes'])
|
||||||
a = clean_basepaths(a_data['runtaskhashes'])
|
b = clean_basepaths(b_data['runtaskhashes'])
|
||||||
b = clean_basepaths(b_data['runtaskhashes'])
|
changed, added, removed = dict_diff(a, b)
|
||||||
changed, added, removed = dict_diff(a, b)
|
if added:
|
||||||
if added:
|
for dep in added:
|
||||||
for dep in added:
|
bdep_found = False
|
||||||
print "Dependency on task %s was added" % (dep)
|
if removed:
|
||||||
if removed:
|
for bdep in removed:
|
||||||
for dep in removed:
|
if a[dep] == b[bdep]:
|
||||||
print "Dependency on task %s was removed" % (dep)
|
#print "Dependency on task %s was replaced by %s with same hash" % (dep, bdep)
|
||||||
if changed:
|
bdep_found = True
|
||||||
for dep in changed:
|
if not bdep_found:
|
||||||
print "Hash for dependent task %s changed from %s to %s" % (dep, a[dep], b[dep])
|
print "Dependency on task %s was added with hash %s" % (dep, a[dep])
|
||||||
else:
|
if removed:
|
||||||
for i in range(len(a_data['runtaskdeps'])):
|
for dep in removed:
|
||||||
aent = a_data['runtaskdeps'][i]
|
adep_found = False
|
||||||
bent = b_data['runtaskdeps'][i]
|
if added:
|
||||||
aname = clean_basepath(aent)
|
for adep in added:
|
||||||
bname = clean_basepath(bent)
|
if a[adep] == b[dep]:
|
||||||
if a_data['runtaskhashes'][aent] != b_data['runtaskhashes'][bent]:
|
#print "Dependency on task %s was replaced by %s with same hash" % (adep, dep)
|
||||||
print "Task dependency hash changed from %s to %s (for %s and %s)" % (a_data['runtaskhashes'][aent], b_data['runtaskhashes'][bent], aname, bname)
|
adep_found = True
|
||||||
|
if not adep_found:
|
||||||
|
print "Dependency on task %s was removed with hash %s" % (dep, b[dep])
|
||||||
|
if changed:
|
||||||
|
for dep in changed:
|
||||||
|
print "Hash for dependent task %s changed from %s to %s" % (dep, a[dep], b[dep])
|
||||||
|
|
||||||
def dump_sigfile(a):
|
def dump_sigfile(a):
|
||||||
p1 = pickle.Unpickler(file(a, "rb"))
|
p1 = pickle.Unpickler(file(a, "rb"))
|
||||||
|
|
Loading…
Reference in New Issue