From 33f973fd2ac189358b9ff6ab71ce7472e10c4364 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Sat, 8 Jan 2022 22:11:17 +0800 Subject: [PATCH] Fix init_boot partition AVB signing Typo: 'BOARD_AVB_INIT_BOOT_IMAGE_KEY_PATH' -> 'BOARD_AVB_INIT_BOOT_KEY_PATH' Record avb_init_boot_* arguments to misc_info.txt Add INIT_BOOT_SECURITY_PATCH to support per-partition SPL. Bug: 203698939 Test: avbtool info_image --image init_boot.img Change-Id: I63e082b1dd675138a6ab5cceb8814b3673d26b13 --- core/Makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index ea5fc491c5..9226df06fc 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1097,7 +1097,7 @@ ifdef BOARD_KERNEL_PAGESIZE endif ifeq ($(BOARD_AVB_ENABLE),true) -$(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(AVBTOOL) $(BOARD_AVB_INIT_BOOT_IMAGE_KEY_PATH) +$(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(AVBTOOL) $(BOARD_AVB_INIT_BOOT_KEY_PATH) $(call pretty,"Target init_boot image: $@") $(MKBOOTIMG) $(INTERNAL_INIT_BOOT_IMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_INIT_ARGS) --output $@ $(call assert-max-image-size,$@,$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE)) @@ -3695,6 +3695,10 @@ BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \ --prop com.android.build.boot.os_version:$(PLATFORM_VERSION_LAST_STABLE) +BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS += \ + --prop com.android.build.init_boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \ + --prop com.android.build.init_boot.os_version:$(PLATFORM_VERSION_LAST_STABLE) + BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.vendor_boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \ @@ -3729,6 +3733,12 @@ BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \ ifdef BOOT_SECURITY_PATCH BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.boot.security_patch:$(BOOT_SECURITY_PATCH) +endif + +ifdef INIT_BOOT_SECURITY_PATCH +BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS += \ + --prop com.android.build.init_boot.security_patch:$(INIT_BOOT_SECURITY_PATCH) +else ifdef BOOT_SECURITY_PATCH BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS += \ --prop com.android.build.init_boot.security_patch:$(BOOT_SECURITY_PATCH) endif @@ -4702,6 +4712,12 @@ ifdef BOARD_AVB_BOOT_KEY_PATH $(hide) echo "avb_boot_algorithm=$(BOARD_AVB_BOOT_ALGORITHM)" >> $@ $(hide) echo "avb_boot_rollback_index_location=$(BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION)" >> $@ endif # BOARD_AVB_BOOT_KEY_PATH + $(hide) echo "avb_init_boot_add_hash_footer_args=$(BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS)" >> $@ +ifdef BOARD_AVB_INIT_BOOT_KEY_PATH + $(hide) echo "avb_init_boot_key_path=$(BOARD_AVB_INIT_BOOT_KEY_PATH)" >> $@ + $(hide) echo "avb_init_boot_algorithm=$(BOARD_AVB_INIT_BOOT_ALGORITHM)" >> $@ + $(hide) echo "avb_init_boot_rollback_index_location=$(BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX_LOCATION)" >> $@ +endif # BOARD_AVB_INIT_BOOT_KEY_PATH echo "avb_vendor_boot_add_hash_footer_args=$(BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS)" >> $@ ifdef BOARD_AVB_VENDOR_BOOT_KEY_PATH echo "avb_vendor_boot_key_path=$(BOARD_AVB_VENDOR_BOOT_KEY_PATH)" >> $@