StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't copy recovery.img to BOOTABLE_IMAGES if it doesn't exist

Browse Source 
If BOARD_USES_RECOVERY_AS_BOOT is set to true, recovery.img is
not built.

If BOARD_CUSTOM_BOOTIMG is set, INSTALLED_RECOVERYIMAGE_TARGET
gets copied to BOOTABLE_IMAGES.

If both are set, the following error is produced.

acp: missing destination file

Since it is possible to have both BOARD_USES_RECOVERY_AS_BOOT and
BOARD_CUSTOM_BOOTIMG set, guard the copy operation so that it does
not try to copy a missing recovery.img.

Change-Id: Iae24e31a586e98955807d213df3dbaa0a2f13bae
Signed-off-by: RITEFANG <1721985272@qq.com>
This commit is contained in:
Cosmin Tanislav
2024-07-24 21:52:13 +03:00
committed by SkyMinus
parent c3a7fada7e
commit 5a05cc117e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -6726,8 +6726,10 @@ ifdef BOARD_CUSTOM_BOOTIMG
@# Prebuilt boot images
$(hide) mkdir -p $(zip_root)/BOOTABLE_IMAGES
$(hide) $(ACP) $(INSTALLED_BOOTIMAGE_TARGET) $(zip_root)/BOOTABLE_IMAGES/
ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
$(hide) $(ACP) $(INSTALLED_RECOVERYIMAGE_TARGET) $(zip_root)/BOOTABLE_IMAGES/
endif
endif
ifdef BUILDING_SYSTEM_IMAGE
@# Contents of the system image
ifneq ($(SOONG_DEFINED_SYSTEM_IMAGE_PATH),)