summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sapkin2026-01-23 18:07:53 +0000
committerRobert Marko2026-01-24 10:02:18 +0000
commit5f889eaacd901ee74a44da07a28abfb6fbbbbf87 (patch)
tree89e976497d6f8ae0ea08408b6c941c9bff479254
parent7c2666821708655ec8af3b032b7ff8820e562663 (diff)
downloadopenwrt-5f889eaacd901ee74a44da07a28abfb6fbbbbf87.tar.gz
imagebuilder: fix parsing ABI for apk packages
Fix parsing ABI when package has multiple tags and apk returns them in a single line. Fixes: 31cdd13d ("imagebuilder: add ABI suffix to packages when using apk") Signed-off-by: George Sapkin <george@sapk.in> Link: https://github.com/openwrt/openwrt/pull/21660 Signed-off-by: Robert Marko <robimarko@gmail.com>
-rw-r--r--target/imagebuilder/files/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index c9de9aee93..2b3c0e6ae0 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -157,7 +157,7 @@ endif
#
# 1: package name
define GetABISuffix
-$(shell $(APK) query --fields tags --match provides $(1) | grep openwrt:abiversion | awk -F= '{print $$2; exit}')
+$(shell $(APK) query --fields tags --match provides $(1) | tr ' ' '\n' | grep '^openwrt:abiversion=' | cut -d= -f2)
endef
# Format packages by adding an ABI version suffix if found