build: fix apk_package_files wildcard for packages without ABI version

The wildcard combined an apk_package_files pattern of $(pkg)-*.apk with a
gen_package_wildcard that ends in [^a-z]*, so the full glob required two
dashes. Files for packages without an ABI version (e.g. ubbf-0~....apk)
only contain one dash and never matched, so ipkg-remove was never called
on them and stale .apk files accumulated in the bin directory.

Drop the explicit dash from apk_package_files. The [^a-z] in
gen_package_wildcard already serves as the dash matcher, and
scripts/ipkg-remove filters precisely by reading apk metadata.

Fixes: 642d568b0f0a ("build: fix ipkg-remove: add support for removing apk files")
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/include/feeds.mk b/include/feeds.mk
index cb3e71ae3b71006b80ec87743ddd8fd893bc3d6d..dfba92fa29377a9aa4939e6bcd7173b98c2953f8 100644 (file)
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -20,7 +20,7 @@ opkg_package_files = $(wildcard \
 
 apk_package_files = $(wildcard \
        $(foreach dir,$(PACKAGE_SUBDIRS), \
-         $(foreach pkg,$(1), $(dir)/$(pkg)-*.apk)))
+         $(foreach pkg,$(1), $(dir)/$(pkg)*.apk)))
 
 # 1: package name
 define FeedPackageDir