summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-04-17 19:01:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-23 23:30:45 +0100
commit3c06699da34904eae33b8c3f81e161313a234cc4 (patch)
tree88e99b241977faf05911df2092d61400c152742e
parent5c5a0938de4db952248e8ed6c73302245d644eec (diff)
downloadpoky-3c06699da34904eae33b8c3f81e161313a234cc4.tar.gz
bitbake: bb: siggen: Make dump_sigfile and compare_sigfiles print uuid4
This can make people easier to understand bitbake-diffsigs/dumpsig's output, otherwise, it's hard to know it is a random uuid unless look into the code. E.g.: $ bitbake bc-native -ccleansstate -Snone $ bitbake bc-native -ccleansstate -Snone $ bitbake-diffsigs tmp/stamps/x86_64-linux/bc-native/1.07.1-r0.do_cleansstate.sigdata.* * Before: Taint (by forced/invalidated task) changed from nostamp:fe79d162-c4a8-4174-8007-f6d4aa09abdc to nostamp:28192187-5021-40c1-9e21-45483b62c910 * Now: Taint (by forced/invalidated task) changed from nostamp(uuid4):fe79d162-c4a8-4174-8007-f6d4aa09abdc to nostamp(uuid4):28192187-5021-40c1-9e21-45483b62c910 (Bitbake rev: 724b4a5cec8c611d53350f3e5a3988ec3222684b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/siggen.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 09c9c8a25f..89bf5339dc 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -633,6 +633,10 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
633 a_taint = a_data.get('taint', None) 633 a_taint = a_data.get('taint', None)
634 b_taint = b_data.get('taint', None) 634 b_taint = b_data.get('taint', None)
635 if a_taint != b_taint: 635 if a_taint != b_taint:
636 if a_taint.startswith('nostamp:'):
637 a_taint = a_taint.replace('nostamp:', 'nostamp(uuid4):')
638 if b_taint.startswith('nostamp:'):
639 b_taint = b_taint.replace('nostamp:', 'nostamp(uuid4):')
636 output.append(color_format("{color_title}Taint (by forced/invalidated task) changed{color_default} from %s to %s") % (a_taint, b_taint)) 640 output.append(color_format("{color_title}Taint (by forced/invalidated task) changed{color_default} from %s to %s") % (a_taint, b_taint))
637 641
638 return output 642 return output
@@ -705,7 +709,11 @@ def dump_sigfile(a):
705 output.append("Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep])) 709 output.append("Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep]))
706 710
707 if 'taint' in a_data: 711 if 'taint' in a_data:
708 output.append("Tainted (by forced/invalidated task): %s" % a_data['taint']) 712 if a_data['taint'].startswith('nostamp:'):
713 msg = a_data['taint'].replace('nostamp:', 'nostamp(uuid4):')
714 else:
715 msg = a_data['taint']
716 output.append("Tainted (by forced/invalidated task): %s" % msg)
709 717
710 if 'task' in a_data: 718 if 'task' in a_data:
711 computed_basehash = calc_basehash(a_data) 719 computed_basehash = calc_basehash(a_data)