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

Unverified Commit d2860b7f authored by Arne Coucheron's avatar Arne Coucheron Committed by Michael Bestas
Browse files

Fix recovery image generation with LZ4 compressed ramdisk 

Change-Id: I37e360de4a8273636877b4d541c597a6376a16cb
parent 16187c08

core/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -2091,7 +2091,7 @@ endif 


ifeq (,$(filter true, $(BOARD_USES_FULL_RECOVERY_IMAGE) $(BOARD_USES_RECOVERY_AS_BOOT) \

  $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO) \

  $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT)))

  $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT) $(BOARD_RAMDISK_USE_LZ4)))

# Named '.dat' so we don't attempt to use imgdiff for patching it.

RECOVERY_RESOURCE_ZIP := $(TARGET_OUT_VENDOR)/etc/recovery-resource.dat

ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_RESOURCE_ZIP)
@@ -2810,7 +2810,8 @@ INSTALLED_SYSTEMIMAGE := $(INSTALLED_SYSTEMIMAGE_TARGET) 
ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

ifneq ($(BOARD_USES_FULL_RECOVERY_IMAGE),true)

ifneq (,$(filter true, $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO)))

ifneq (,$(filter true, $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO) \

      $(BOARD_RAMDISK_USE_LZ4)))

diff_tool := $(HOST_OUT_EXECUTABLES)/bsdiff

else

diff_tool := $(HOST_OUT_EXECUTABLES)/imgdiff