mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-20 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: siggen: Fix type conversion issues

Browse Source 
The switch to using json has messed up the type handling as the code
does assume that set()s are present. Add a decoder to reconstruct
the set() objects. Also fix the change of tuples to lists for the
file checksums and fix an existing type bug where dicts insteads of
lists was used.

Drop some old siginfo format handling code which is now long since
obsolete.

(Bitbake rev: 2d704842c0928f8dbe78fd081042aa7280af96be)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-10-16 09:05:41 +01:00
parent b8be48c718
commit 1028d0158a
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bitbake/lib/bb/siggen.py
View File

@@ -24,9 +24,14 @@ hashequiv_logger = logging.getLogger('BitBake.SigGen.HashEquiv')
class SetEncoder(json.JSONEncoder): class SetEncoder(json.JSONEncoder):
def default(self, obj): def default(self, obj):
if isinstance(obj, set): if isinstance(obj, set):
return list(sorted(obj)) return dict(_set_object=list(sorted(obj)))
return json.JSONEncoder.default(self, obj) return json.JSONEncoder.default(self, obj)
def SetDecoder(dct):
if '_set_object' in dct:
return set(dct['_set_object'])
return dct
def init(d): def init(d):
siggens = [obj for obj in globals().values() siggens = [obj for obj in globals().values()
if type(obj) is type and issubclass(obj, SignatureGenerator)] if type(obj) is type and issubclass(obj, SignatureGenerator)]
@@ -803,9 +808,9 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
return formatstr.format(**formatparams) return formatstr.format(**formatparams)
with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f: with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f:
a_data = json.load(f) a_data = json.load(f, object_hook=SetDecoder)
with bb.compress.zstd.open(b, "rt", encoding="utf-8", num_threads=1) as f: with bb.compress.zstd.open(b, "rt", encoding="utf-8", num_threads=1) as f:
b_data = json.load(f) b_data = json.load(f, object_hook=SetDecoder)
def dict_diff(a, b, whitelist=set()): def dict_diff(a, b, whitelist=set()):
sa = set(a.keys()) sa = set(a.keys())
@@ -821,11 +826,11 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
def file_checksums_diff(a, b): def file_checksums_diff(a, b):
from collections import Counter from collections import Counter
# Handle old siginfo format
if isinstance(a, dict): # Convert lists back to tuples
a = [(os.path.basename(f), cs) for f, cs in a.items()] a = [(f[0], f[1]) for f in a]
if isinstance(b, dict): b = [(f[0], f[1]) for f in b]
b = [(os.path.basename(f), cs) for f, cs in b.items()]
# Compare lists, ensuring we can handle duplicate filenames if they exist # Compare lists, ensuring we can handle duplicate filenames if they exist
removedcount = Counter(a) removedcount = Counter(a)
removedcount.subtract(b) removedcount.subtract(b)
@@ -908,9 +913,9 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
output.append(color_format("{color_title}Variable {var} value changed from '{color_default}{oldval}{color_title}' to '{color_default}{newval}{color_title}'{color_default}", var=dep, oldval=oldval, newval=newval)) output.append(color_format("{color_title}Variable {var} value changed from '{color_default}{oldval}{color_title}' to '{color_default}{newval}{color_title}'{color_default}", var=dep, oldval=oldval, newval=newval))
if not 'file_checksum_values' in a_data: if not 'file_checksum_values' in a_data:
a_data['file_checksum_values'] = {} a_data['file_checksum_values'] = []
if not 'file_checksum_values' in b_data: if not 'file_checksum_values' in b_data:
b_data['file_checksum_values'] = {} b_data['file_checksum_values'] = []
changed, added, removed = file_checksums_diff(a_data['file_checksum_values'], b_data['file_checksum_values']) changed, added, removed = file_checksums_diff(a_data['file_checksum_values'], b_data['file_checksum_values'])
if changed: if changed:
@@ -1038,7 +1043,7 @@ def dump_sigfile(a):
output = [] output = []
with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f: with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f:
a_data = json.load(f) a_data = json.load(f, object_hook=SetDecoder)
output.append("basewhitelist: %s" % (a_data['basewhitelist'])) output.append("basewhitelist: %s" % (a_data['basewhitelist']))