summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-03-02 17:50:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-04 11:38:30 +0000
commit7ed45239631796086c78546776096f62ea090718 (patch)
tree27924123fa8fd63ede9035f223192a8a5456dec3
parent226c4384643da635fb668cdf0ccd32fea943875d (diff)
downloadpoky-7ed45239631796086c78546776096f62ea090718.tar.gz
bitbake: siggen: add quotes around variable values to see whitespace
* without this change it's hard to see what's changed: bitbake-diffsigs sstate-cache/*/sstate-depmodwrapper-cross-cortexa8-vfp-neon-oe-linux-gnueabi-1.0-r0-cortexa8-vfp-neon-*_populate-sysroot.tgz.siginfo basehash changed from 62f28c13172d38af917716d6d4b15ac5 to 9cf38842bcc79e0a4356856a64141548 Variable TUNE_CCARGS value changed from -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 to -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 Hash for dependent task depmodwrapper-cross_1.0.bb.do_install changed from 4494cb6c117309a9b4c541ad86c0aac5 to 1e3bcf2d14e5bd30a38350b41bb98db3 * with this change, we can see extra trailing space in first version: basehash changed from 62f28c13172d38af917716d6d4b15ac5 to 9cf38842bcc79e0a4356856a64141548 Variable TUNE_CCARGS value changed from ' -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 ' to ' -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8' Hash for dependent task depmodwrapper-cross_1.0.bb.do_install changed from 4494cb6c117309a9b4c541ad86c0aac5 to 1e3bcf2d14e5bd30a38350b41bb98db3 (Bitbake rev: 7d85b1a383feaa072503d71d3baeb3bdcd1012a8) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/siggen.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 50e4558611..8861337b92 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -331,12 +331,12 @@ def compare_sigfiles(a, b, recursecb = None):
331 return changed, added, removed 331 return changed, added, removed
332 332
333 if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']: 333 if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']:
334 output.append("basewhitelist changed from %s to %s" % (a_data['basewhitelist'], b_data['basewhitelist'])) 334 output.append("basewhitelist changed from '%s' to '%s'" % (a_data['basewhitelist'], b_data['basewhitelist']))
335 if a_data['basewhitelist'] and b_data['basewhitelist']: 335 if a_data['basewhitelist'] and b_data['basewhitelist']:
336 output.append("changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist'])) 336 output.append("changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist']))
337 337
338 if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']: 338 if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']:
339 output.append("taskwhitelist changed from %s to %s" % (a_data['taskwhitelist'], b_data['taskwhitelist'])) 339 output.append("taskwhitelist changed from '%s' to '%s'" % (a_data['taskwhitelist'], b_data['taskwhitelist']))
340 if a_data['taskwhitelist'] and b_data['taskwhitelist']: 340 if a_data['taskwhitelist'] and b_data['taskwhitelist']:
341 output.append("changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist'])) 341 output.append("changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist']))
342 342
@@ -349,7 +349,7 @@ def compare_sigfiles(a, b, recursecb = None):
349 changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist']) 349 changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist'])
350 if changed: 350 if changed:
351 for dep in changed: 351 for dep in changed:
352 output.append("List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])) 352 output.append("List of dependencies for variable %s changed from '%s' to '%s'" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep]))
353 if a_data['gendeps'][dep] and b_data['gendeps'][dep]: 353 if a_data['gendeps'][dep] and b_data['gendeps'][dep]:
354 output.append("changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep])) 354 output.append("changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep]))
355 if added: 355 if added:
@@ -363,7 +363,7 @@ def compare_sigfiles(a, b, recursecb = None):
363 changed, added, removed = dict_diff(a_data['varvals'], b_data['varvals']) 363 changed, added, removed = dict_diff(a_data['varvals'], b_data['varvals'])
364 if changed: 364 if changed:
365 for dep in changed: 365 for dep in changed:
366 output.append("Variable %s value changed from %s to %s" % (dep, a_data['varvals'][dep], b_data['varvals'][dep])) 366 output.append("Variable %s value changed from '%s' to '%s'" % (dep, a_data['varvals'][dep], b_data['varvals'][dep]))
367 367
368 changed, added, removed = dict_diff(a_data['file_checksum_values'], b_data['file_checksum_values']) 368 changed, added, removed = dict_diff(a_data['file_checksum_values'], b_data['file_checksum_values'])
369 if changed: 369 if changed: