From 9f25d9336943bfe37303df3105c4f69bf1ff3c03 Mon Sep 17 00:00:00 2001 From: Gorgone Date: Tue, 9 Jun 2020 21:32:10 +0200 Subject: [PATCH 1/3] fix download toolchains --- s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s3 b/s3 index f2b1957..1df03b2 100755 --- a/s3 +++ b/s3 @@ -88,7 +88,7 @@ UPX="not_set" OPENBOX=0 UFS916003=0 _t1e="VG9vbGNoYWluLQ==" -_u1e="aHR0cDovL3N0cmVhbWJvYXJkLnR2L3diYjIvdHV0LXBpY3MvdG9vbGNoYWlucw==" +_u1e="aHR0cHM6Ly9maWxlcy5zdHJlYW1ib2FyZC50di90b29sY2hhaW5z" run="0" cposx=0 From 59001752c2c5f9da78782cbdff43ec5f40ac549f Mon Sep 17 00:00:00 2001 From: WXbet Date: Tue, 9 Jun 2020 21:42:12 +0200 Subject: [PATCH 2/3] 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}'); From fdb979e0eb78fcc2b9e3a84e30751773585a0722 Mon Sep 17 00:00:00 2001 From: WXbet Date: Sun, 21 Jun 2020 17:17:58 +0200 Subject: [PATCH 3/3] s3.TUP Fix cross toolchain template property detection (v0.13.2) fix detection of template properties for endianness variants --- support/functions/_plugin_update_toolchain | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index 6fb8d12..6680d53 100644 --- a/support/functions/_plugin_update_toolchain +++ b/support/functions/_plugin_update_toolchain @@ -3,7 +3,7 @@ #simplebuild_plugin tcupdate tcupdate(){ - pversion="0.13.1"; + pversion="0.13.2"; pname="s3.TUP"; pdesc="Plugin $pname v$pversion"; configname="$configdir/plugin_update_toolchain.config"; @@ -690,8 +690,10 @@ _get_template_properties(){ #extract template properties if [ $(_get_template_type "$1") == "CTNG" ];then arch=$(grep '^CT_ARCH=' "$1" | awk -F'"' '{print $2}'); - endian=$(grep '^CT_ARCH_ENDIAN=' "$1" | awk -F'"' '{print $2}'); - end=${endian^}; + [ $(grep -i '^CT_ARCH_LE=y' "$1") ] && endianness ="LE"; + [ $(grep -i '^CT_ARCH_BE=y' "$1") ] && endianness ="BE"; + [ $(grep -i '^CT_ARCH_LE_BE=y' "$1") ] && endianness ="LE+BE"; + [ $(grep -i '^CT_ARCH_BE_LE=y' "$1") ] && endianness ="BE+LE"; 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"; @@ -713,7 +715,7 @@ _get_template_properties(){ make olddefconfig >/dev/null; arch=$(grep '^FREETZ_TARGET_ARCH=' ".config" | awk -F'"' '{print $2}'); bitness=$(grep '^FREETZ_GCC_ABI=' ".config" | awk -F'"' '{print $2}'); - [ $(grep -i '^FREETZ_TARGET_ARCH_BE=y' ".config") ] && end="B" || end="L"; + [ $(grep -i '^FREETZ_TARGET_ARCH_BE=y' ".config") ] && endianness ="BE" || endianness ="LE"; [ $(grep -i '^FREETZ_LIB_libuClibc=y' ".config") ] && libc="uClibc"; [ $(grep -i '^FREETZ_LIB_libglibc=y' ".config") ] && libc="glibc"; [ $(grep -i '^FREETZ_LIB_libumusl=y' ".config") ] && libc="musl"; @@ -730,7 +732,7 @@ _get_template_properties(){ fi; #build template property string - [ -z $setup ] && desc="$desc ($arch$cpu$aarch $bitness-bit ${end:0:1}E, $libc $libcv, $cc $ccv, $kernel $kernelv)"; + [ -z $setup ] && desc="$desc ($arch$cpu$aarch $bitness-bit $endianness , $libc $libcv, $cc $ccv, $kernel $kernelv)"; fi; echo $desc; [ -n "$desc" ] && exit 0 || exit 1;