diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-02 11:13:56 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-09 10:56:49 +0000 |
commit | b400b781bd06bade6bd73d5f8f884d4f08f34ef4 (patch) | |
tree | 47febef79f87b331f0ae9823852aedc913480fa2 /bitbake | |
parent | 43ee80e8b8a40811bfe248f2c62c52d04c34893c (diff) | |
download | poky-b400b781bd06bade6bd73d5f8f884d4f08f34ef4.tar.gz |
bitbake: siggen: Ensure dumpsig output is deterministic
Currently the console output for signature dumps e.g. with bitbake-dumpsig
isn't deterministic. Add some sorting to improve that.
(Bitbake rev: a663440b1623f97c9c169df5566e429fbc932a53)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 44965c8cca..e0ec736dff 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -1054,28 +1054,28 @@ def dump_sigfile(a): | |||
1054 | with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f: | 1054 | with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f: |
1055 | a_data = json.load(f, object_hook=SetDecoder) | 1055 | a_data = json.load(f, object_hook=SetDecoder) |
1056 | 1056 | ||
1057 | output.append("basewhitelist: %s" % (a_data['basewhitelist'])) | 1057 | output.append("basewhitelist: %s" % (sorted(a_data['basewhitelist']))) |
1058 | 1058 | ||
1059 | output.append("taskwhitelist: %s" % (a_data['taskwhitelist'])) | 1059 | output.append("taskwhitelist: %s" % (sorted(a_data['taskwhitelist'] or []))) |
1060 | 1060 | ||
1061 | output.append("Task dependencies: %s" % (sorted(a_data['taskdeps']))) | 1061 | output.append("Task dependencies: %s" % (sorted(a_data['taskdeps']))) |
1062 | 1062 | ||
1063 | output.append("basehash: %s" % (a_data['basehash'])) | 1063 | output.append("basehash: %s" % (a_data['basehash'])) |
1064 | 1064 | ||
1065 | for dep in a_data['gendeps']: | 1065 | for dep in sorted(a_data['gendeps']): |
1066 | output.append("List of dependencies for variable %s is %s" % (dep, a_data['gendeps'][dep])) | 1066 | output.append("List of dependencies for variable %s is %s" % (dep, sorted(a_data['gendeps'][dep]))) |
1067 | 1067 | ||
1068 | for dep in a_data['varvals']: | 1068 | for dep in sorted(a_data['varvals']): |
1069 | output.append("Variable %s value is %s" % (dep, a_data['varvals'][dep])) | 1069 | output.append("Variable %s value is %s" % (dep, a_data['varvals'][dep])) |
1070 | 1070 | ||
1071 | if 'runtaskdeps' in a_data: | 1071 | if 'runtaskdeps' in a_data: |
1072 | output.append("Tasks this task depends on: %s" % (a_data['runtaskdeps'])) | 1072 | output.append("Tasks this task depends on: %s" % (sorted(a_data['runtaskdeps']))) |
1073 | 1073 | ||
1074 | if 'file_checksum_values' in a_data: | 1074 | if 'file_checksum_values' in a_data: |
1075 | output.append("This task depends on the checksums of files: %s" % (a_data['file_checksum_values'])) | 1075 | output.append("This task depends on the checksums of files: %s" % (sorted(a_data['file_checksum_values']))) |
1076 | 1076 | ||
1077 | if 'runtaskhashes' in a_data: | 1077 | if 'runtaskhashes' in a_data: |
1078 | for dep in a_data['runtaskhashes']: | 1078 | for dep in sorted(a_data['runtaskhashes']): |
1079 | output.append("Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep])) | 1079 | output.append("Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep])) |
1080 | 1080 | ||
1081 | if 'taint' in a_data: | 1081 | if 'taint' in a_data: |