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

releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE

Browse Source 
This variable is always false or empty now, so clean up remaining
references to the variable.

Bug: 241346584
Test: Presubmit
Change-Id: I5dd3d356729d0bd2639633580bbb85f8b03582cf
This commit is contained in:
Yi-Yo Chiang
2022-10-12 18:29:14 +08:00
parent e5bfa38457
commit 18650c7be0
7 changed files with 19 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/releasetools/validate_target_files.py
View File

@@ -361,18 +361,15 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options):
"Mismatching mincrypt verity key files"
logging.info('Verified the content of /verity_key')
# For devices with a separate ramdisk (i.e. non-system-as-root), there must
# be a copy in ramdisk.
if info_dict.get("system_root_image") != "true":
verity_key_ramdisk = os.path.join(
input_tmp, 'BOOT', 'RAMDISK', 'verity_key')
assert os.path.exists(
verity_key_ramdisk), 'Missing verity_key in ramdisk'
verity_key_ramdisk = os.path.join(
input_tmp, 'BOOT', 'RAMDISK', 'verity_key')
assert os.path.exists(
verity_key_ramdisk), 'Missing verity_key in ramdisk'
assert filecmp.cmp(
verity_key_mincrypt, verity_key_ramdisk, shallow=False), \
'Mismatching verity_key files in root and ramdisk'
logging.info('Verified the content of /verity_key in ramdisk')
assert filecmp.cmp(
verity_key_mincrypt, verity_key_ramdisk, shallow=False), \
'Mismatching verity_key files in root and ramdisk'
logging.info('Verified the content of /verity_key in ramdisk')
# Then verify the verity signed system/vendor/product images, against the
# verity pubkey in mincrypt format.