From bf9f07a62966043c0f1fd7ac4a249790643d1f9a Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 22 Mar 2023 13:24:57 +0100 Subject: ukify: allow uncompressed kernel images for UNAME detection on aarch64 and riscv64 (#26929) Uncompressed aarch64 and riscv64 kernels have a different startpoint than x86. Example output from ukify: aarch64: NotImplementedError: unknown file format (starts with b'MZ@\xfa') riscv64: NotImplementedError: unknown file format (starts with b'MZo\x10') Add check for (b'MZ') to catch both in one call. Fix: https://github.com/systemd/systemd/issues/26923 --- src/ukify/ukify.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ukify') diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py index d34d3acc27..0231c55245 100755 --- a/src/ukify/ukify.py +++ b/src/ukify/ukify.py @@ -106,6 +106,10 @@ def maybe_decompress(filename): # not compressed return f.read() + if start.startswith(b'MZ'): + # not compressed aarch64 and riscv64 + return f.read() + if start.startswith(b'\x1f\x8b'): gzip = try_import('gzip') return gzip.open(f).read() -- cgit v1.2.1