StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix prebuilt boot image hermetic build

Browse Source 
Break when we find a working salt, certain devices have boot image
containing both the kernel and ramdisk, resulting in the ramdisk being
used as salt. Since core/Makefile uses kernel as salt, update python
code to match.

Bug: 293313353
Test: th
Change-Id: I68b5a8c2f0747ddf68f775bc2a6c5db46eb7eb64
This commit is contained in:
Kelvin Zhang
2023-11-01 10:12:03 -07:00
parent ad2c02c98d
commit 9f9ac4e8a0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/common.py
View File

@@ -1908,8 +1908,11 @@ def _SignBootableImage(image_path, prebuilt_name, partition_name,
for filename in ["kernel", "ramdisk", "vendor_ramdisk00"]: for filename in ["kernel", "ramdisk", "vendor_ramdisk00"]:
path = os.path.join(tmpdir, filename) path = os.path.join(tmpdir, filename)
if os.path.exists(path) and os.path.getsize(path): if os.path.exists(path) and os.path.getsize(path):
print("Using {} as salt for avb footer of {}".format(
filename, partition_name))
with open(path, "rb") as fp: with open(path, "rb") as fp:
salt = sha256(fp.read()).hexdigest() salt = sha256(fp.read()).hexdigest()
break
AppendAVBSigningArgs(cmd, partition_name, salt) AppendAVBSigningArgs(cmd, partition_name, salt)
args = info_dict.get("avb_" + partition_name + "_add_hash_footer_args") args = info_dict.get("avb_" + partition_name + "_add_hash_footer_args")
if args and args.strip(): if args and args.strip():