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

Commit 65c1eaba authored by Matt Mower's avatar Matt Mower Committed by Michael Bestas
Browse files

build: Separate commands in recovery foreach loops 

The foreach loops output a space separated list, not necessarily one
command per line. Separate commands with semicolons. Notably, this
fixes an issue with multiple device directories included in
TARGET_RECOVERY_DEVICE_DIRS.

Change-Id: I5ebdc84ecaaacabaea77b8b752141e2041622480
parent 1a7c7b3b

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -2245,11 +2245,11 @@ $(recovery_uncompressed_ramdisk): $(MKBOOTFS) \ 
	  cp -rf $(recovery_text_file) $(TARGET_RECOVERY_ROOT_OUT)/res/images/ &&) true

	cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png

	$(foreach item,$(recovery_root_private), \

	  cp -rf $(item) $(TARGET_RECOVERY_OUT)/)

	  cp -rf $(item) $(TARGET_RECOVERY_OUT)/;)

	$(foreach item,$(TARGET_PRIVATE_RES_DIRS), \

	  cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/$(newline))

	  cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/$(newline);)

	$(foreach item,$(recovery_fstab), \

	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/system/etc/recovery.fstab)

	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/system/etc/recovery.fstab;)

	$(if $(strip $(recovery_wipe)), \

	  cp -f $(recovery_wipe) $(TARGET_RECOVERY_ROOT_OUT)/system/etc/recovery.wipe)

	ln -sf prop.default $(TARGET_RECOVERY_ROOT_OUT)/default.prop