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

Commit bf56966e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I4a07512f,Ib9e7dbb1 into main 

* changes:
  make/core/Makefile: Build and dist insecure recovery image
  make/core/Makefile: Distribute the recovery swap kernel
parents 81e0c056 42bff9e6

core/Makefile

+27 −0
Original line number Diff line number Diff line
@@ -7988,6 +7988,7 @@ include $(BUILD_SYSTEM)/layoutlib_data.mk 
# -----------------------------------------------------------------

# Desktop pack common variables.

PACK_IMAGE_SCRIPT := $(HOST_OUT_EXECUTABLES)/pack_image

UPDATE_PARTITION_SCRIPT := $(HOST_OUT_EXECUTABLES)/update-partition

IMAGES := $(INSTALLED_BOOTIMAGE_TARGET) \

	$(INSTALLED_SUPERIMAGE_TARGET) \

	$(INSTALLED_INIT_BOOT_IMAGE_TARGET) \
@@ -8050,6 +8051,32 @@ $(call dist-for-goals,dist_files,$(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET)) 
.PHONY: pack-recovery-image

pack-recovery-image: $(PACK_RECOVERY_IMAGE_TARGET)



RECOVERY_SWAP_KERNEL_TARGET := $(PRODUCT_OUT)/recovery-kernel-swap



# Has swap kernel for insecure recovery image.

ifeq ($(BOARD_USES_DESKTOP_RECOVERY_SWAP_KERNEL),true)



$(call dist-for-goals,dist_files,$(RECOVERY_SWAP_KERNEL_TARGET))



PACK_INSECURE_RECOVERY_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_insecure_recovery_image.bin



$(PACK_INSECURE_RECOVERY_IMAGE_TARGET): PRIVATE_SGDISK := $(HOST_OUT_EXECUTABLES)/sgdisk

$(PACK_INSECURE_RECOVERY_IMAGE_TARGET): $(PACK_RECOVERY_IMAGE_TARGET) $(UPDATE_PARTITION_SCRIPT) $(RECOVERY_SWAP_KERNEL_TARGET)

	@cp -f $< $@

	(export SGDISK=$(PRIVATE_SGDISK); $(UPDATE_PARTITION_SCRIPT) KERN-A $@ $(RECOVERY_SWAP_KERNEL_TARGET))



PACKED_INSECURE_RECOVERY_IMAGE_ARCHIVE_TARGET := $(PACK_INSECURE_RECOVERY_IMAGE_TARGET).gz



$(PACKED_INSECURE_RECOVERY_IMAGE_ARCHIVE_TARGET): $(PACK_INSECURE_RECOVERY_IMAGE_TARGET) | $(GZIP)

	$(GZIP) -fk $(PACK_INSECURE_RECOVERY_IMAGE_TARGET)



$(call dist-for-goals,dist_files,$(PACKED_INSECURE_RECOVERY_IMAGE_ARCHIVE_TARGET))



.PHONY: pack-insecure-recovery-image

pack-insecure-recovery-image: $(PACK_INSECURE_RECOVERY_IMAGE_TARGET)



endif # BOARD_USES_DESKTOP_RECOVERY_SWAP_KERNEL



endif # BOARD_USES_DESKTOP_RECOVERY_IMAGE



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

core/board_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -933,6 +933,12 @@ ifeq ($(PRODUCT_BUILD_DESKTOP_RECOVERY_IMAGE),true) 
endif

.KATI_READONLY := BOARD_USES_DESKTOP_RECOVERY_IMAGE



BOARD_USES_DESKTOP_RECOVERY_SWAP_KERNEL :=

ifeq ($(PRODUCT_USES_DESKTOP_RECOVERY_SWAP_KERNEL),true)

  BOARD_USES_DESKTOP_RECOVERY_SWAP_KERNEL := true

endif

.KATI_READONLY := BOARD_USES_DESKTOP_RECOVERY_SWAP_KERNEL



BOARD_USES_DESKTOP_UPDATE_IMAGE :=

ifeq ($(PRODUCT_BUILD_DESKTOP_UPDATE_IMAGE),true)

  BOARD_USES_DESKTOP_UPDATE_IMAGE := true