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: 642d568b0f ("build: fix ipkg-remove: add support for removing apk files")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2026-05-16 16:23:07 +00:00
parent 0c2fb39c5a
commit e7530a287a
+1 -1
View File
@@ -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