projects
/
openwrt
/
staging
/
linusw.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc2ba10
)
build: fix filtering of non-upgradable packages
author
Eric Fahlgren
<
[email protected]
>
Thu, 21 Nov 2024 13:50:21 +0000
(
05:50
-0800)
committer
Robert Marko
<
[email protected]
>
Thu, 21 Nov 2024 16:55:45 +0000
(17:55 +0100)
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 <
[email protected]
>
Link:
https://github.com/openwrt/openwrt/pull/17032
Signed-off-by: Robert Marko <
[email protected]
>
package/Makefile
patch
|
blob
|
history
diff --git
a/package/Makefile
b/package/Makefile
index 3c6621b81c3c13112bab39e2d9789cd616262142..ca43eb7e01642bd870c41152963de72c9122b44c 100644
(file)
--- 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 -v
E '^(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}' | \