mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2026-02-07 03:26:21 -05:00
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>
This commit is contained in:
committed by
Robert Marko
parent
7c26668217
commit
5f889eaacd
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user