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>

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index c9de9aee93aadc3107c426660293d6e85007e5b4..2b3c0e6ae0671f852411df1a6bd8aeb95474f331 100644 (file)
--- 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