From 6cbee855a320ff3a2af82ed3bd291d4eb9de11ae Mon Sep 17 00:00:00 2001 From: WXbet <57314510+WXbet@users.noreply.github.com> Date: Sat, 28 Mar 2020 20:59:18 +0100 Subject: [PATCH 1/2] s3.TUP: new cross toolchain template qnap_armv7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QNAP ARM-Cortex-A9 devices (armv7 based, gcc 9.2.0, Glibc 2.17) thx almöni for testing --- support/crosstool/templates/qnap_armv7 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 support/crosstool/templates/qnap_armv7 diff --git a/support/crosstool/templates/qnap_armv7 b/support/crosstool/templates/qnap_armv7 new file mode 100644 index 0000000..831b645 --- /dev/null +++ b/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"; From 06c1a1d5441712955f23c24f99e5879d34f03ba3 Mon Sep 17 00:00:00 2001 From: WXbet <57314510+WXbet@users.noreply.github.com> Date: Sat, 28 Mar 2020 21:01:39 +0100 Subject: [PATCH 2/2] s3.TUP cleanup build directory (v0.11.5) Remove temporary toolchain build directory after successful build to save disk space --- support/functions/_plugin_update_toolchain | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index 97ec033..8847078 100644 --- a/support/functions/_plugin_update_toolchain +++ b/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";