From 2784f78c6c22c0731ef551e4fcd42295f08a07a5 Mon Sep 17 00:00:00 2001 From: Eric Fahlgren Date: Thu, 21 Nov 2024 05:50:21 -0800 Subject: [PATCH] build: fix filtering of non-upgradable packages Add anchor to name search so that we don't inadvertently filter out packages containing, say, "kernel-" as part of their name. Fixes: openwrt/packages#25372 Signed-off-by: Eric Fahlgren Link: https://github.com/openwrt/openwrt/pull/17032 Signed-off-by: Robert Marko --- package/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile b/package/Makefile index 3c6621b81c..ca43eb7e01 100644 --- a/package/Makefile +++ b/package/Makefile @@ -131,7 +131,7 @@ ifneq ($(CONFIG_USE_APK),) --keys-dir $(TOPDIR) \ --sign $(BUILD_KEY_APK_SEC) \ --output packages.adb \ - $$(ls *.apk | grep -v 'base-files-\|kernel-\|libc-'); \ + $$(ls *.apk | grep -vE '^(base-files-|kernel-|libc-)'); \ echo -n '{"architecture": "$(ARCH_PACKAGES)", "packages":{' > index.json; \ $(STAGING_DIR_HOST)/bin/apk adbdump packages.adb | \ awk '/- name: / {pkg = $$NF} ; / version: / {printf "\"%s\": \"%s\", ", pkg, $$NF}' | \ -- 2.30.2