[openwrt/openwrt] include/package-pack: remove APK files before building package

LEDE Commits lede-commits at lists.infradead.org
Tue Jun 11 14:58:58 PDT 2024


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/ba7305c3e40fee1ab8da326e7f32955d8e5bf79b

commit ba7305c3e40fee1ab8da326e7f32955d8e5bf79b
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Wed May 22 19:33:52 2024 +0200

    include/package-pack: remove APK files before building package
    
    As done for OPKG, correctly remove APK files before building package to
    make sure we don't work on dirty files.
    
    Link: https://github.com/openwrt/openwrt/pull/15543
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 include/package-pack.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/package-pack.mk b/include/package-pack.mk
index 16b56344e1..5054e8dc85 100644
--- a/include/package-pack.mk
+++ b/include/package-pack.mk
@@ -205,6 +205,8 @@ $(_endef)
 	rm -rf $$(IDIR_$(1))
 ifeq ($$(CONFIG_USE_APK),)
 	$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_package_wildcard,$(1))))
+else
+	$$(call remove_ipkg_files,$(1),$$(call apk_package_files,$(call gen_package_wildcard,$(1))))
 endif
 	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1)) $(PKG_INFO_DIR)
 	$(call Package/$(1)/install,$$(IDIR_$(1)))




More information about the lede-commits mailing list