mirror of
https://github.com/openwrt/openwrt.git
synced 2024-11-23 01:45:38 +08:00
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 <ericfahlgren@gmail.com> Link: https://github.com/openwrt/openwrt/pull/17032 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
fc2ba10108
commit
2784f78c6c
@ -131,7 +131,7 @@ ifneq ($(CONFIG_USE_APK),)
|
|||||||
--keys-dir $(TOPDIR) \
|
--keys-dir $(TOPDIR) \
|
||||||
--sign $(BUILD_KEY_APK_SEC) \
|
--sign $(BUILD_KEY_APK_SEC) \
|
||||||
--output packages.adb \
|
--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; \
|
echo -n '{"architecture": "$(ARCH_PACKAGES)", "packages":{' > index.json; \
|
||||||
$(STAGING_DIR_HOST)/bin/apk adbdump packages.adb | \
|
$(STAGING_DIR_HOST)/bin/apk adbdump packages.adb | \
|
||||||
awk '/- name: / {pkg = $$NF} ; / version: / {printf "\"%s\": \"%s\", ", pkg, $$NF}' | \
|
awk '/- name: / {pkg = $$NF} ; / version: / {printf "\"%s\": \"%s\", ", pkg, $$NF}' | \
|
||||||
|
Loading…
Reference in New Issue
Block a user