Browse Source

s3.TUP Fix cross toolchain template property detection (v0.13.2)

fix detection of template properties for endianness variants
pull/40/head
WXbet 5 years ago
parent
commit
fdb979e0eb
  1. 12
      support/functions/_plugin_update_toolchain

12
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;

Loading…
Cancel
Save