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

Commit c03af94c authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Rashed Abdel-Tawab
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: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
parent ec9f8fa5

core/Makefile

+35 −8
Original line number Diff line number Diff line
@@ -648,7 +648,8 @@ ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true) 
ifeq ($(TARGET_BOOTIMAGE_USE_EXT2),true)

$(error TARGET_BOOTIMAGE_USE_EXT2 is not supported anymore)



else ifeq (true,$(BOARD_AVB_ENABLE)) # TARGET_BOOTIMAGE_USE_EXT2 != true

else ifndef BOARD_CUSTOM_BOOTIMG_MK

ifeq (true,$(BOARD_AVB_ENABLE)) # TARGET_BOOTIMAGE_USE_EXT2 != true



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILES) $(BOARD_AVB_BOOT_KEY_PATH)

	$(call pretty,"Target boot image: $@")
@@ -714,7 +715,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
@@ -1072,6 +1074,7 @@ IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(r 


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_props := $(intermediate_system_build_prop)

ifdef property_overrides_split_enabled

recovery_build_props += $(INSTALLED_VENDOR_BUILD_PROP_TARGET)
@@ -1201,9 +1204,7 @@ define build-image-kernel-modules 
    $(hide) cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules

endef



# $(1): output file

define build-recoveryimage-target

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

define build-recoveryramdisk

  $(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...
@@ -1241,7 +1242,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))
@@ -1289,14 +1294,16 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) $(ADBD) \ 
		$(BOARD_RECOVERY_KERNEL_MODULES) \

		$(DEPMOD)

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

		$(call build-recoveryramdisk)

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

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

endif



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

$(recovery_uncompressed_ramdisk): $(MKBOOTFS) $(ADBD) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \

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

		$(recovery_initrc) $(recovery_sepolicy) \

		$(INSTALLED_2NDBOOTLOADER_TARGET) \

		$(recovery_build_props) $(recovery_resource_deps) \

		$(recovery_fstab) \
@@ -1304,7 +1311,20 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) $(ADBD) 
		$(INSTALLED_VENDOR_DEFAULT_PROP_TARGET) \

		$(BOARD_RECOVERY_KERNEL_MODULES) \

		$(DEPMOD)

		$(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)
@@ -1316,6 +1336,8 @@ endif 
.PHONY: recoveryimage-nodeps

recoveryimage-nodeps:

	@echo "make $@: ignoring dependencies"

	$(call build-recoveryramdisk)

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

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



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

#