From e7530a287a0a60b5aed829639b3289f14671c10f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 16 May 2026 16:23:07 +0000 Subject: [PATCH] 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 --- include/feeds.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/feeds.mk b/include/feeds.mk index cb3e71ae3b7..dfba92fa293 100644 --- 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