ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

image: apk: dont fail on removing a package that doesnt exist

Browse Source 
Currently, in case when a package in the device package list is marked with
the "-"" prefix meaning that its supposed to be removed for that device but
it was not actually previously built it will cause the APK to error out it
and thus image generation will also fail.

So, lets do what OPKG build step does and supress the error with the "-"
prefix in make.

Fixes: #17103
Fixes: d788ab376f ("build: add APK package build capabilities")
Link: https://github.com/openwrt/openwrt/pull/17106
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Robert Marko 2024-11-28 19:16:23 +01:00
parent 5a4eb56a7b
commit 55dfe3fcea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/image.mk
View File

@ -373,7 +373,7 @@ ifneq ($(CONFIG_USE_APK),)
rm -rf $(mkfs_cur_target_dir) rm -rf $(mkfs_cur_target_dir)
$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir) $(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
$(if $(mkfs_packages_remove), \ $(if $(mkfs_packages_remove), \
$(apk_target) del $(mkfs_packages_remove)) -$(apk_target) del $(mkfs_packages_remove))
$(if $(mkfs_packages_add), \ $(if $(mkfs_packages_add), \
$(apk_target) add $(mkfs_packages_add)) $(apk_target) add $(mkfs_packages_add))
else else