Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 161fe380 authored by Yueyao Zhu's avatar Yueyao Zhu Committed by SzuWei Lin
Browse files

Makefile: support build and avb signing of dtbo img 

Test: make with corresponding configurations in BoardConfig.mk
- dtbo.img is copied to the OUT directory
- avbtool info_image --image dtbo.img shows avb hashes
- avbtool info_image --image vbmeta.img shows dtbo partition info

Bug: 37730955
Change-Id: If3edaab860926c743f18fd031c911b076eb09fab
(cherry picked from commit 211c9015)
parent 879b9c3b

core/Makefile

+27 −1
Original line number Diff line number Diff line
@@ -1804,6 +1804,26 @@ INSTALLED_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img 
$(eval $(call copy-one-file,$(BOARD_PREBUILT_VENDORIMAGE),$(INSTALLED_VENDORIMAGE_TARGET)))

endif



# -----------------------------------------------------------------

# dtbo image

ifdef BOARD_PREBUILT_DTBOIMAGE

INSTALLED_DTBOIMAGE_TARGET := $(PRODUCT_OUT)/dtbo.img



ifeq ($(BOARD_AVB_ENABLE),true)

$(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE) $(AVBTOOL)

	cp $(BOARD_PREBUILT_DTBOIMAGE) $@

	$(AVBTOOL) add_hash_footer \

		--image $@ \

		--partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \

		--partition_name dtbo $(INTERNAL_AVB_SIGNING_ARGS) \

		$(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)

else

$(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

	cp $(BOARD_PREBUILT_DTBOIMAGE) $@

endif



endif



# -----------------------------------------------------------------

# vbmeta image

ifeq ($(BOARD_AVB_ENABLE),true)
@@ -1819,6 +1839,11 @@ INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \ 
    --include_descriptors_from_image $(INSTALLED_VENDORIMAGE_TARGET)

endif



ifdef INSTALLED_DTBOIMAGE_TARGET

INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \

		--include_descriptors_from_image $(INSTALLED_DTBOIMAGE_TARGET)

endif



ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += --setup_rootfs_from_kernel $(BUILT_SYSTEMIMAGE)

endif
@@ -1855,7 +1880,7 @@ define build-vbmetaimage-target 
endef



INSTALLED_VBMETAIMAGE_TARGET := $(BUILT_VBMETAIMAGE_TARGET)

$(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL) $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_VENDORIMAGE_TARGET)

$(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL) $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_VENDORIMAGE_TARGET) $(INSTALLED_DTBOIMAGE_TARGET)

	$(build-vbmetaimage-target)



.PHONY: vbmetaimage-nodeps
@@ -2102,6 +2127,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
		$(INSTALLED_USERDATAIMAGE_TARGET) \

		$(INSTALLED_CACHEIMAGE_TARGET) \

		$(INSTALLED_VENDORIMAGE_TARGET) \

		$(INSTALLED_DTBOIMAGE_TARGET) \

		$(INTERNAL_SYSTEMOTHERIMAGE_FILES) \

		$(INSTALLED_ANDROID_INFO_TXT_TARGET) \

		$(INSTALLED_KERNEL_TARGET) \