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

Unverified Commit 2311094b authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Michael Bestas
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

[mikeioannina]: Squash cm-13.0 changes and adapt to N

Change-Id: I6a744e19612d96a4a6213de0d183366b4730ed0c
parent 5dd69711

core/Makefile

+43 −13
Original line number Diff line number Diff line
@@ -575,7 +575,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_VBOOT)) # PRODUCT_SUPPORTS_BOOT_SIGNER != true



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

	$(call pretty,"Target boot image: $@")
@@ -603,7 +605,8 @@ bootimage-nodeps: $(MKBOOTIMG) 
	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET)

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



endif # TARGET_BOOTIMAGE_USE_EXT2

  endif # PRODUCT_SUPPORTS_VBOOT

endif # TARGET_BOOTIMAGE_USE_EXT2 / BOARD_CUSTOM_BOOTIMG_MK

endif # BOARD_USES_RECOVERY_AS_BOOT



else	# TARGET_NO_KERNEL
@@ -871,6 +874,7 @@ recovery_initrc := $(call include-path-for, recovery)/etc/init.rc 
recovery_sepolicy := $(call intermediates-dir-for,ETC,sepolicy.recovery)/sepolicy.recovery

recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system

recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img

recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio

recovery_build_prop := $(intermediate_system_build_prop)

recovery_resources_common := $(call include-path-for, recovery)/res
@@ -994,10 +998,8 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 
	@mkdir -p $(dir $@)

	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@



RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id

# $(1): output file

define build-recoveryimage-target

  @echo ----- Making recovery image ------

define build-recoveryramdisk

  @echo ----- Making recovery ramdisk ------

  $(hide) mkdir -p $(TARGET_RECOVERY_OUT)

  $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/sdcard $(TARGET_RECOVERY_ROOT_OUT)/tmp

  @echo Copying baseline ramdisk...
@@ -1028,7 +1030,11 @@ define build-recoveryimage-target 
    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root; \

            rm -rf $(TARGET_RECOVERY_ROOT_OUT)/system; \

            ln -sf /system_root/system $(TARGET_RECOVERY_ROOT_OUT)/system) # Mount the system_root_image to /system_root and symlink /system.

  $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)

endef



RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id

# $(1): output file

define build-recoveryimage-target

  $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1).unsigned, \

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1) --id > $(RECOVERYIMAGE_ID_FILE))
@@ -1062,19 +1068,35 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
		$(recovery_fstab) \

		$(RECOVERY_INSTALL_OTA_KEYS)

	$(call pretty,"Target boot image from recovery: $@")

	$(call build-recoveryramdisk)

	$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $(recovery_uncompressed_ramdisk)

	$(hide) $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $(recovery_ramdisk)

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

endif



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

$(recovery_uncompressed_ramdisk): $(MKBOOTFS) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \

		$(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \

		$(recovery_initrc) $(recovery_sepolicy) \

		$(INSTALLED_2NDBOOTLOADER_TARGET) \

		$(recovery_build_prop) $(recovery_resource_deps) $(recovery_root_deps) \

		$(recovery_fstab) \

		$(RECOVERY_INSTALL_OTA_KEYS)

	$(call build-recoveryramdisk)

	@echo "----- Making uncompressed recovery ramdisk ------"

	$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@



$(recovery_ramdisk): $(MINIGZIP) \

		$(recovery_uncompressed_ramdisk)

	@echo "----- Making compressed recovery ramdisk ------"

	$(hide) $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $@



ifndef BOARD_CUSTOM_BOOTIMG_MK

$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel)

	@echo "----- Making recovery image ------"

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

endif # BOARD_CUSTOM_BOOTIMG_MK



ifdef RECOVERY_RESOURCE_ZIP

$(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET) | $(ZIPTIME)
@@ -1086,6 +1108,9 @@ endif 
.PHONY: recoveryimage-nodeps

recoveryimage-nodeps:

	@echo "make $@: ignoring dependencies"

	$(call build-recoveryramdisk)

	$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $(recovery_uncompressed_ramdisk)

	$(hide) $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $(recovery_ramdisk)

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



else # INSTALLED_RECOVERYIMAGE_TARGET not defined
@@ -1103,6 +1128,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

#