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

Commit 409f818f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Adnan Begovic
Browse files

Redo BOARD_CUSTOM_BOOTIMG_MK support 

Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step

Change-Id: Ie49620e5e438222d2b80efeefcde4d136e346b90
parent 6a7d0f19

core/Makefile

+13 −3
Original line number Diff line number Diff line
@@ -549,7 +549,9 @@ bootimage-nodeps: $(MKBOOTIMG) $(BOOT_SIGNER) 
	$(BOOT_SIGNER) /boot $(INSTALLED_BOOTIMAGE_TARGET) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(INSTALLED_BOOTIMAGE_TARGET)

	$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))



else ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)) # PRODUCT_SUPPORTS_BOOT_SIGNER != true

else ifndef BOARD_CUSTOM_BOOTIMG_MK



  ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)) # TARGET_BOOTIMAGE_USE_EXT2 != true



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(VBOOT_SIGNER)

	$(call pretty,"Target boot image: $@")
@@ -579,7 +581,8 @@ bootimage-nodeps: $(MKBOOTIMG) 
	$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))

	@echo -e ${CL_INS}"Made boot image: $@"${CL_RST}



endif # TARGET_BOOTIMAGE_USE_EXT2

  endif # PRODUCT_SUPPORTS_VERITY

endif # TARGET_BOOTIMAGE_USE_EXT2 / BOARD_CUSTOM_BOOTIMG_MK



else	# TARGET_NO_KERNEL

# HACK: The top-level targets depend on the bootimage.  Not all targets
@@ -941,7 +944,7 @@ define build-recoveryimage-target 
  @echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}

endef



$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

$(recovery_ramdisk): $(MKBOOTFS) $(MINIGZIP) $(RECOVERYIMAGE_EXTRA_DEPS) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \
@@ -952,6 +955,8 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
		$(RECOVERY_INSTALL_OTA_KEYS)

		$(call build-recoveryimage-target, $@)



endif # BOARD_CUSTOM_BOOTIMG_MK



$(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET)

	$(hide) mkdir -p $(dir $@)

	$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort | zip -0qrj $@ -@
@@ -976,6 +981,11 @@ ifeq ($(BOARD_NAND_SPARE_SIZE),) 
BOARD_NAND_SPARE_SIZE := 64

endif



ifdef BOARD_CUSTOM_BOOTIMG_MK

include $(BOARD_CUSTOM_BOOTIMG_MK)

endif





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

# system image

#