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

Unverified Commit 6a313de2 authored by Andreas Blaesius's avatar Andreas Blaesius Committed by Michael Bestas
Browse files

Force bsdiff for recovery_from_boot.p if not using GZIP 

imgdiff expects a ramdisk to use GZIP, which is causing a chunk
size issue if recovery is using LZMA

Change-Id: I3194b4faed25a298fe23b4e24b6dea2885bafda8
parent 42c85b42

core/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -1269,7 +1269,11 @@ $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \ 
	                     $(HOST_OUT_EXECUTABLES)/bsdiff

	                     $(HOST_OUT_EXECUTABLES)/bsdiff

	@echo "Construct recovery from boot"

	@echo "Construct recovery from boot"

	mkdir -p $(dir $@)

	mkdir -p $(dir $@)

ifeq ($(TARGET_NOT_USE_GZIP_RECOVERY_RAMDISK),true)

	PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/bsdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@

else

	PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@

	PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@

endif

else # $(BOARD_USES_FULL_RECOVERY_IMAGE) == true

else # $(BOARD_USES_FULL_RECOVERY_IMAGE) == true

RECOVERY_FROM_BOOT_PATCH := $(INSTALLED_RECOVERYIMAGE_TARGET)

RECOVERY_FROM_BOOT_PATCH := $(INSTALLED_RECOVERYIMAGE_TARGET)

endif

endif