[openwrt/openwrt] imagebuilder: fix parsing ABI for apk packages

LEDE Commits lede-commits at lists.infradead.org
Sat Jan 24 02:02:22 PST 2026


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/5f889eaacd901ee74a44da07a28abfb6fbbbbf87

commit 5f889eaacd901ee74a44da07a28abfb6fbbbbf87
Author: George Sapkin <george at sapk.in>
AuthorDate: Fri Jan 23 20:07:53 2026 +0200

    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 at sapk.in>
    Link: https://github.com/openwrt/openwrt/pull/21660
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/imagebuilder/files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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




More information about the lede-commits mailing list