From b2fea5878c04de0921b8a8cc849d45e064aed126 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Thu, 6 Oct 2016 13:05:38 -0400 Subject: [PATCH] Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true. Often BOARD_USES_RECOVERY_AS_BOOT is used together with BOARD_BUILD_SYSTEM_ROOT_IMAGE, but with this combination we're currently not adding a hash footer to boot.img. Fix this. Bug: 31119415 Test: Built with BOARD_USES_RECOVERY_AS_BOOT set to true and inspected images. Merged-In: If033e5c93f5b71fd17405af7d970dc3f0540a1d2 Change-Id: I2f10bbffb0ba2467d53e3e62d5379c3ab7236063 --- core/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/Makefile b/core/Makefile index 42d42bb47..824cdcfb3 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1045,6 +1045,12 @@ define build-recoveryimage-target $(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1)) $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \ $(VBOOT_SIGNER) $(FUTILITY) $(1).unsigned $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_SUBKEY).vbprivk $(1).keyblock $(1)) + $(if $(and $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),$(filter true,$(BOARD_AVB_ENABLE))), \ + $(hide) $(AVBTOOL) add_hash_footer \ + --image $(1) \ + --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) \ + --partition_name boot $(INTERNAL_AVB_SIGNING_ARGS) \ + $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS)) $(if $(filter true,BOARD_USES_RECOVERY_AS_BOOT), \ $(hide) $(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE)), \ $(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))) -- 2.11.0