From 88fc2bdd195b29e8ea976f317773724ec06473d7 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Wed, 5 Jan 2022 20:19:25 +0800 Subject: [PATCH] Avoid packing ramdisk into GKI boot-*.img If init_boot.img is present, the GKI boot-*.img should not include the ramdisk because the ramdisk will be packed into the init_boot.img instead. The "has_ramdisk" flag incorrectly checks the condition of: prebuilt_name != "boot.img" to see if it is a boot.img. Because "has_ramdisk" was added before we packed multiple GKI boot-*.img, e.g., boot-5.10.img, boot-5.10-lz4.img, etc., into the target files. Fix this by checking the partition_name is "boot" or not. Also moving the logic into a new function with comments for each condition. Bug: 203698939 Bug: 213028932 Test: sign_target_files_apks \ --gki_signing_key=external/avb/test/data/testkey_rsa4096.pem \ --gki_signing_algorithm=SHA256_RSA4096 \ ./out/dist/*-target_files-eng.*.zip signed.zip, then unpack_bootimg to checks the signed boot-*.img has no ramdisk Change-Id: I5354669feb54d547dbe797e51b1b1baa187cb7cf --- tools/releasetools/common.py | 44 +++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 6ec1b94687..339939f85b 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1699,8 +1699,8 @@ def _SignBootableImage(image_path, prebuilt_name, partition_name, Args: image_path: The full path of the image, e.g., /path/to/boot.img. prebuilt_name: The prebuilt image name, e.g., boot.img, boot-5.4-gz.img, - boot-5.10.img, recovery.img. - partition_name: The partition name, e.g., 'boot' or 'recovery'. + boot-5.10.img, recovery.img or init_boot.img. + partition_name: The partition name, e.g., 'boot', 'init_boot' or 'recovery'. info_dict: The information dict read from misc_info.txt. """ if info_dict is None: @@ -1724,6 +1724,35 @@ def _SignBootableImage(image_path, prebuilt_name, partition_name, RunAndCheckOutput(cmd) +def HasRamdisk(partition_name, info_dict=None): + """Returns true/false to see if a bootable image should have a ramdisk. + + Args: + partition_name: The partition name, e.g., 'boot', 'init_boot' or 'recovery'. + info_dict: The information dict read from misc_info.txt. + """ + if info_dict is None: + info_dict = OPTIONS.info_dict + + if partition_name != "boot": + return True # init_boot.img or recovery.img has a ramdisk. + + if info_dict.get("recovery_as_boot") == "true": + return True # the recovery-as-boot boot.img has a RECOVERY ramdisk. + + if info_dict.get("system_root_image") == "true": + # The ramdisk content is merged into the system.img, so there is NO + # ramdisk in the boot.img or boot-.img. + return False + + if info_dict.get("init_boot") == "true": + # The ramdisk is moved to the init_boot.img, so there is NO + # ramdisk in the boot.img or boot-.img. + return False + + return True + + def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, info_dict=None, two_step_image=False): """Return a File object with the desired bootable image. @@ -1745,25 +1774,18 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, logger.info("using prebuilt %s from IMAGES...", prebuilt_name) return File.FromLocalFile(name, prebuilt_path) + partition_name = tree_subdir.lower() prebuilt_path = os.path.join(unpack_dir, "PREBUILT_IMAGES", prebuilt_name) if os.path.exists(prebuilt_path): logger.info("Re-signing prebuilt %s from PREBUILT_IMAGES...", prebuilt_name) signed_img = MakeTempFile() shutil.copy(prebuilt_path, signed_img) - partition_name = tree_subdir.lower() _SignBootableImage(signed_img, prebuilt_name, partition_name, info_dict) return File.FromLocalFile(name, signed_img) logger.info("building image from target_files %s...", tree_subdir) - # With system_root_image == "true", we don't pack ramdisk into the boot image. - # With init_boot == "true", we don't pack the ramdisk into boot.img. - # Unless "recovery_as_boot" is specified, in which case we carry the ramdisk - # for recovery. - has_ramdisk = ((info_dict.get("system_root_image") != "true" and - info_dict.get("init_boot") != "true") or - prebuilt_name != "boot.img" or - info_dict.get("recovery_as_boot") == "true") + has_ramdisk = HasRamdisk(partition_name, info_dict) fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt" data = _BuildBootableImage(prebuilt_name, os.path.join(unpack_dir, tree_subdir),