diff options
| author | Christian Marangi | 2024-05-22 17:33:52 +0000 |
|---|---|---|
| committer | Christian Marangi | 2024-06-11 21:58:13 +0000 |
| commit | ba7305c3e40fee1ab8da326e7f32955d8e5bf79b (patch) | |
| tree | 5f6fe957c856a606597ad2d5bc60566d96a30093 | |
| parent | b569d0cc3fc5215d66aab4bcdd4ece8ebde29901 (diff) | |
| download | openwrt-ba7305c3e40fee1ab8da326e7f32955d8e5bf79b.tar.gz | |
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@gmail.com>
| -rw-r--r-- | include/package-pack.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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))) |