From 59001752c2c5f9da78782cbdff43ec5f40ac549f Mon Sep 17 00:00:00 2001 From: WXbet Date: Tue, 9 Jun 2020 21:42:12 +0200 Subject: [PATCH] s3.TUP Fix cross toolchain template property detection (v0.13.1) fix detection of template properties for sh variant --- support/functions/_plugin_update_toolchain | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index ae731f3..6fb8d12 100644 --- a/support/functions/_plugin_update_toolchain +++ b/support/functions/_plugin_update_toolchain @@ -3,7 +3,7 @@ #simplebuild_plugin tcupdate tcupdate(){ - pversion="0.13.0"; + pversion="0.13.1"; pname="s3.TUP"; pdesc="Plugin $pname v$pversion"; configname="$configdir/plugin_update_toolchain.config"; @@ -695,6 +695,7 @@ _get_template_properties(){ bitness=$(grep '^CT_ARCH_BITNESS=' "$1" | awk -F'=' '{print $2}'); [ "$arch" == "arm" ] && [ "$bitness" == "64" ] && arch="aarch64"; cpu=$(grep '^CT_ARCH_CPU=' "$1" | awk -F'"' '{print $2}') && [ -n "$cpu" ] && cpu=" $cpu"; + [ -z "$cpu" ] && cpu=$(grep -i "^CT_ARCH_${arch}_VARIANT=" "$1" | awk -F'"' '{print $2}') && [ -n "$cpu" ] && cpu=" $cpu"; aarch=$(grep '^CT_ARCH_ARCH=' "$1" | awk -F'"' '{print $2}') && [ -n "$aarch" ] && aarch=" $aarch"; cc=$(grep '^CT_CC=' "$1" | awk -F'"' '{print $2}'); ccv=$(grep -i "CT_${cc}_VERSION=" "$1" | awk -F'"' '{print $2}');