Просмотр исходного кода

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 <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/21660
Signed-off-by: Robert Marko <[email protected]>
George Sapkin 2 недель назад
Родитель
Сommit
5f889eaacd
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      target/imagebuilder/files/Makefile

+ 1 - 1
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