Browse Source

Merge branch 'next'

pull/41/head
WXbet 5 years ago
parent
commit
4dd12d4e5c
  1. 17
      support/crosstool/templates/qnap_armv7
  2. 8
      support/functions/_plugin_update_toolchain

17
support/crosstool/templates/qnap_armv7

@ -0,0 +1,17 @@
_toolchainname="qnap_armv7";
default_use="USE_UTF8 USE_LIBCRYPTO";
_description="QNAP ARM-Cortex-A9 devices (armv7 based, gcc 9.2.0, Glibc 2.17)";
_oscamconfdir_default="/etc/tuxbox/config";
_oscamconfdir_custom="";
_self_build="yes";
_compiler="armv7-qnap-linux-gnueabi-";
_sysroot="armv7-qnap-linux-gnueabi/sysroot";
_libsearchdir="/usr/lib";
_toolchainfilename="VG9vbGNoYWluLXFuYXAyX2FybXY3LnRhci54eg==";
_md5sum="2a8735b5c4afa7c06534c7826ce1af97 Toolchain-qnap_armv7.tar.xz";
_tc_info="\n
!!! crosstool-NG Toolchain !!!\n
\n
QNAP ARM-Cortex-A9 devices (armv7 based, gcc 9.2.0, Glibc 2.17)\n
\n";
_tc_infolines="5";

8
support/functions/_plugin_update_toolchain

@ -3,7 +3,7 @@
#simplebuild_plugin tcupdate
tcupdate(){
pversion="0.11.4";
pversion="0.11.5";
pname="s3.TUP";
pdesc="Plugin $pname v$pversion";
configname="$configdir/plugin_update_toolchain.config";
@ -348,7 +348,11 @@ _create_tc(){
if [ ! $err -gt 0 ]; then
#get target from build.log
target=$(sed -n -e '/target = / s/.*\= *//p' "$ctsrcdir/build.log");
#get CT_BUILD_TOP_DIR aka temporary toolchain build directory from build.log and delete it to save disk space
buildtopdir=$(sed -n -e '/CT_BUILD_TOP_DIR=\// s/.*\= *//p' "$ctsrcdir/build.log");
[ -d "$buildtopdir" ] && rm -rf "$buildtopdir" 2>/dev/null;
#compress toolchain
_compress "$dldir/Toolchain-$tpl.tar.xz" "$tcdir/$tpl" | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Compress cross toolchain $tpl to Toolchain-$tpl.tar.xz ]- " "$pb_" "$_lines" "$_cols";

Loading…
Cancel
Save