From 515c38a6214db408724468f9a346a59d0c7c3f9d Mon Sep 17 00:00:00 2001
From: WXbet <root@delphi.galaxie.lan>
Date: Mon, 17 Feb 2020 21:12:26 +0100
Subject: [PATCH] update cross toolchain templates to disable debug facilities
 (v0.9.2) show creation date of toolchains in Toolchain Menu fix error
 validating PCSC header files

---
 support/crosstool/templates/ar71xx_mips     |  99 ++---------------
 support/crosstool/templates/ath79_mips      | 102 +++---------------
 support/crosstool/templates/dream_aarch64   |  99 +++--------------
 support/crosstool/templates/dream_arm       | 101 +++--------------
 support/crosstool/templates/dream_mipsel    |  82 ++------------
 support/crosstool/templates/ds126play_armv7 | 101 +++--------------
 support/crosstool/templates/rpi_armv6       | 113 +-------------------
 support/crosstool/templates/rpi_armv7       | 100 +++--------------
 support/crosstool/templates/rpi_armv8       | 100 +++--------------
 support/crosstool/templates/vuplus4k_arm    | 101 +++--------------
 support/functions/_plugin_update_toolchain  |   7 +-
 11 files changed, 119 insertions(+), 886 deletions(-)

diff --git a/support/crosstool/templates/ar71xx_mips b/support/crosstool/templates/ar71xx_mips
index 2f92423..69e853b 100644
--- a/support/crosstool/templates/ar71xx_mips
+++ b/support/crosstool/templates/ar71xx_mips
@@ -427,111 +427,36 @@ CT_CC_LANG_CXX=y
 # CT_CC_LANG_OBJCXX is not set
 # CT_CC_LANG_GOLANG is not set
 CT_CC_LANG_OTHERS=""
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
 # CT_DUMA_SRC_DEVEL is not set
 # CT_DUMA_SRC_CUSTOM is not set
-CT_DUMA_PATCH_GLOBAL=y
+# CT_DUMA_PATCH_GLOBAL is not set
 # CT_DUMA_PATCH_BUNDLED is not set
 # CT_DUMA_PATCH_LOCAL is not set
 # CT_DUMA_PATCH_BUNDLED_LOCAL is not set
 # CT_DUMA_PATCH_LOCAL_BUNDLED is not set
 # CT_DUMA_PATCH_NONE is not set
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
 # CT_GDB_SRC_DEVEL is not set
 # CT_GDB_SRC_CUSTOM is not set
-CT_GDB_PATCH_GLOBAL=y
+# CT_GDB_PATCH_GLOBAL is not set
 # CT_GDB_PATCH_BUNDLED is not set
 # CT_GDB_PATCH_LOCAL is not set
 # CT_GDB_PATCH_BUNDLED_LOCAL is not set
 # CT_GDB_PATCH_LOCAL_BUNDLED is not set
 # CT_GDB_PATCH_NONE is not set
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
-CT_GDB_CROSS_PYTHON_BINARY=""
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-CT_GDB_NATIVE=y
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_STATIC is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
 # CT_DEBUG_LTRACE is not set
 # CT_DEBUG_STRACE is not set
-# CT_STRACE_SRC_RELEASE is not set
-# CT_STRACE_SRC_DEVEL is not set
-# CT_STRACE_SRC_CUSTOM is not set
-# CT_STRACE_PATCH_GLOBAL is not set
-# CT_STRACE_PATCH_BUNDLED is not set
-# CT_STRACE_PATCH_LOCAL is not set
-# CT_STRACE_PATCH_BUNDLED_LOCAL is not set
-# CT_STRACE_PATCH_LOCAL_BUNDLED is not set
-# CT_STRACE_PATCH_NONE is not set
-# CT_STRACE_V_5_4 is not set
-# CT_STRACE_V_5_3 is not set
-# CT_STRACE_V_5_2 is not set
-# CT_STRACE_V_5_1 is not set
-# CT_STRACE_V_5_0 is not set
-# CT_STRACE_V_4_26 is not set
-# CT_STRACE_V_4_25 is not set
-# CT_STRACE_V_4_24 is not set
-# CT_STRACE_V_4_23 is not set
-# CT_STRACE_V_4_22 is not set
-# CT_STRACE_V_4_21 is not set
-# CT_STRACE_V_4_20 is not set
-# CT_STRACE_V_4_19 is not set
-# CT_STRACE_V_4_18 is not set
-# CT_STRACE_V_4_17 is not set
-# CT_STRACE_V_4_16 is not set
-# CT_STRACE_V_4_15 is not set
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -762,17 +687,11 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_EXPAT_NEEDED=y
-CT_EXPAT_TARGET=y
-CT_NCURSES_NEEDED=y
-CT_NCURSES_TARGET=y
 CT_ZLIB_NEEDED=y
 CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
-CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
 # CT_COMP_TOOLS_AUTOCONF is not set
diff --git a/support/crosstool/templates/ath79_mips b/support/crosstool/templates/ath79_mips
index 5efe59e..b060e4d 100644
--- a/support/crosstool/templates/ath79_mips
+++ b/support/crosstool/templates/ath79_mips
@@ -427,109 +427,46 @@ CT_CC_LANG_CXX=y
 # CT_CC_LANG_OBJCXX is not set
 # CT_CC_LANG_GOLANG is not set
 CT_CC_LANG_OTHERS=""
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
 # CT_DUMA_SRC_DEVEL is not set
 # CT_DUMA_SRC_CUSTOM is not set
-CT_DUMA_PATCH_GLOBAL=y
+# CT_DUMA_PATCH_GLOBAL is not set
 # CT_DUMA_PATCH_BUNDLED is not set
 # CT_DUMA_PATCH_LOCAL is not set
 # CT_DUMA_PATCH_BUNDLED_LOCAL is not set
 # CT_DUMA_PATCH_LOCAL_BUNDLED is not set
 # CT_DUMA_PATCH_NONE is not set
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
 # CT_GDB_SRC_DEVEL is not set
 # CT_GDB_SRC_CUSTOM is not set
-CT_GDB_PATCH_GLOBAL=y
+# CT_GDB_PATCH_GLOBAL is not set
 # CT_GDB_PATCH_BUNDLED is not set
 # CT_GDB_PATCH_LOCAL is not set
 # CT_GDB_PATCH_BUNDLED_LOCAL is not set
 # CT_GDB_PATCH_LOCAL_BUNDLED is not set
 # CT_GDB_PATCH_NONE is not set
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
-CT_GDB_CROSS_PYTHON_BINARY=""
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-CT_GDB_NATIVE=y
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_STATIC is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
 # CT_DEBUG_LTRACE is not set
-# CT_LTRACE_SRC_RELEASE is not set
-# CT_LTRACE_SRC_DEVEL is not set
-# CT_LTRACE_SRC_CUSTOM is not set
-# CT_LTRACE_PATCH_GLOBAL is not set
-# CT_LTRACE_PATCH_BUNDLED is not set
-# CT_LTRACE_PATCH_LOCAL is not set
-# CT_LTRACE_PATCH_BUNDLED_LOCAL is not set
-# CT_LTRACE_PATCH_LOCAL_BUNDLED is not set
-# CT_LTRACE_PATCH_NONE is not set
-# CT_LTRACE_V_0_7_3 is not set
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
 # CT_STRACE_SRC_DEVEL is not set
 # CT_STRACE_SRC_CUSTOM is not set
-CT_STRACE_PATCH_GLOBAL=y
+# CT_STRACE_PATCH_GLOBAL is not set
 # CT_STRACE_PATCH_BUNDLED is not set
 # CT_STRACE_PATCH_LOCAL is not set
 # CT_STRACE_PATCH_BUNDLED_LOCAL is not set
 # CT_STRACE_PATCH_LOCAL_BUNDLED is not set
 # CT_STRACE_PATCH_NONE is not set
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -546,13 +483,6 @@ CT_STRACE_V_5_4=y
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -783,17 +713,11 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_EXPAT_NEEDED=y
-CT_EXPAT_TARGET=y
-CT_NCURSES_NEEDED=y
-CT_NCURSES_TARGET=y
 CT_ZLIB_NEEDED=y
 CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
-CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
 # CT_COMP_TOOLS_AUTOCONF is not set
diff --git a/support/crosstool/templates/dream_aarch64 b/support/crosstool/templates/dream_aarch64
index c9eab1f..fa953cd 100644
--- a/support/crosstool/templates/dream_aarch64
+++ b/support/crosstool/templates/dream_aarch64
@@ -420,88 +420,24 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
-CT_GDB_CROSS_PYTHON_BINARY=""
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-# CT_GDB_NATIVE is not set
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
-CT_DEBUG_LTRACE=y
-CT_DEBUG_LTRACE_PKG_KSYM="LTRACE"
-CT_LTRACE_DIR_NAME="ltrace"
-CT_LTRACE_PKG_NAME="ltrace"
-CT_LTRACE_SRC_RELEASE=y
-CT_LTRACE_PATCH_ORDER="global"
-CT_LTRACE_V_0_7_3=y
-# CT_LTRACE_NO_VERSIONS is not set
-CT_LTRACE_VERSION="0.7.3"
-CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace"
-CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig"
-CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2"
-CT_LTRACE_SIGNATURE_FORMAT=""
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
+# CT_DEBUG_LTRACE is not set
+# CT_LTRACE_SRC_RELEASE is not set
+# CT_LTRACE_V_0_7_3 is not set
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -518,13 +454,6 @@ CT_STRACE_V_5_4=y
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -718,7 +647,6 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
@@ -727,7 +655,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/crosstool/templates/dream_arm b/support/crosstool/templates/dream_arm
index fe14bc2..2f0d618 100644
--- a/support/crosstool/templates/dream_arm
+++ b/support/crosstool/templates/dream_arm
@@ -433,87 +433,24 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-# CT_GDB_CROSS_PYTHON is not set
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-CT_GDB_NATIVE=y
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
-CT_DEBUG_LTRACE=y
-CT_DEBUG_LTRACE_PKG_KSYM="LTRACE"
-CT_LTRACE_DIR_NAME="ltrace"
-CT_LTRACE_PKG_NAME="ltrace"
-CT_LTRACE_SRC_RELEASE=y
-CT_LTRACE_PATCH_ORDER="global"
-CT_LTRACE_V_0_7_3=y
-# CT_LTRACE_NO_VERSIONS is not set
-CT_LTRACE_VERSION="0.7.3"
-CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace"
-CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig"
-CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2"
-CT_LTRACE_SIGNATURE_FORMAT=""
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
+# CT_DEBUG_LTRACE is not set
+# CT_LTRACE_SRC_RELEASE is not set
+# CT_LTRACE_V_0_7_3 is not set
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -530,13 +467,6 @@ CT_STRACE_V_5_4=y
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -730,11 +660,7 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_LIBELF_TARGET=y
-CT_EXPAT_NEEDED=y
-CT_EXPAT_TARGET=y
 CT_NCURSES_NEEDED=y
-CT_NCURSES_TARGET=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
 CT_GETTEXT=y
@@ -742,7 +668,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/crosstool/templates/dream_mipsel b/support/crosstool/templates/dream_mipsel
index 6a4b548..59e0bfb 100644
--- a/support/crosstool/templates/dream_mipsel
+++ b/support/crosstool/templates/dream_mipsel
@@ -414,75 +414,22 @@ CT_CC_GCC_mips_plt=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
-CT_GDB_CROSS_PYTHON_BINARY=""
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-# CT_GDB_NATIVE is not set
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
 # CT_DEBUG_LTRACE is not set
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -499,13 +446,6 @@ CT_STRACE_V_5_4=y
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -699,7 +639,6 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
@@ -708,7 +647,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/crosstool/templates/ds126play_armv7 b/support/crosstool/templates/ds126play_armv7
index bd5a729..5055c6c 100644
--- a/support/crosstool/templates/ds126play_armv7
+++ b/support/crosstool/templates/ds126play_armv7
@@ -433,87 +433,24 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-# CT_GDB_CROSS_PYTHON is not set
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-CT_GDB_NATIVE=y
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
-CT_DEBUG_LTRACE=y
-CT_DEBUG_LTRACE_PKG_KSYM="LTRACE"
-CT_LTRACE_DIR_NAME="ltrace"
-CT_LTRACE_PKG_NAME="ltrace"
-CT_LTRACE_SRC_RELEASE=y
-CT_LTRACE_PATCH_ORDER="global"
-CT_LTRACE_V_0_7_3=y
-# CT_LTRACE_NO_VERSIONS is not set
-CT_LTRACE_VERSION="0.7.3"
-CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace"
-CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig"
-CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2"
-CT_LTRACE_SIGNATURE_FORMAT=""
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-# CT_STRACE_V_5_4=y
+# CT_DEBUG_LTRACE is not set
+# CT_LTRACE_SRC_RELEASE is not set
+# CT_LTRACE_V_0_7_3 is not set
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -530,13 +467,6 @@ CT_STRACE_PATCH_ORDER="global"
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.3"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -730,11 +660,7 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_LIBELF_TARGET=y
-CT_EXPAT_NEEDED=y
-CT_EXPAT_TARGET=y
 CT_NCURSES_NEEDED=y
-CT_NCURSES_TARGET=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
 CT_GETTEXT=y
@@ -742,7 +668,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/crosstool/templates/rpi_armv6 b/support/crosstool/templates/rpi_armv6
index ce0e8ed..de06ba2 100644
--- a/support/crosstool/templates/rpi_armv6
+++ b/support/crosstool/templates/rpi_armv6
@@ -345,7 +345,7 @@ CT_GLIBC_ENABLE_OBSOLETE_RPC=y
 # CT_GLIBC_DISABLE_VERSIONING is not set
 CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
-CT_GLIBC_LOCALES=y
+# CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
 # CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
 CT_GLIBC_KERNEL_VERSION_CHOSEN=y
@@ -441,110 +441,10 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
-# CT_GDB_V_8_2 is not set
-# CT_GDB_V_8_1 is not set
-# CT_GDB_V_8_0 is not set
-# CT_GDB_V_7_12 is not set
-# CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-# CT_GDB_CROSS_PYTHON is not set
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-# CT_GDB_NATIVE is not set
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
-CT_DEBUG_LTRACE=y
-CT_DEBUG_LTRACE_PKG_KSYM="LTRACE"
-CT_LTRACE_DIR_NAME="ltrace"
-CT_LTRACE_PKG_NAME="ltrace"
-CT_LTRACE_SRC_RELEASE=y
-CT_LTRACE_PATCH_ORDER="global"
-CT_LTRACE_V_0_7_3=y
-# CT_LTRACE_NO_VERSIONS is not set
-CT_LTRACE_VERSION="0.7.3"
-CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace"
-CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig"
-CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2"
-CT_LTRACE_SIGNATURE_FORMAT=""
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
-# CT_STRACE_V_5_3 is not set
-# CT_STRACE_V_5_2 is not set
-# CT_STRACE_V_5_1 is not set
-# CT_STRACE_V_5_0 is not set
-# CT_STRACE_V_4_26 is not set
-# CT_STRACE_V_4_25 is not set
-# CT_STRACE_V_4_24 is not set
-# CT_STRACE_V_4_23 is not set
-# CT_STRACE_V_4_22 is not set
-# CT_STRACE_V_4_21 is not set
-# CT_STRACE_V_4_20 is not set
-# CT_STRACE_V_4_19 is not set
-# CT_STRACE_V_4_18 is not set
-# CT_STRACE_V_4_17 is not set
-# CT_STRACE_V_4_16 is not set
-# CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
+# CT_DEBUG_DUMA is not set
+# CT_DEBUG_GDB is not set
+# CT_DEBUG_LTRACE is not set
+# CT_DEBUG_STRACE is not set
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -738,8 +638,6 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_LIBELF_TARGET=y
-CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
@@ -748,7 +646,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/crosstool/templates/rpi_armv7 b/support/crosstool/templates/rpi_armv7
index e8c7920..7411eaa 100644
--- a/support/crosstool/templates/rpi_armv7
+++ b/support/crosstool/templates/rpi_armv7
@@ -444,88 +444,24 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
-CT_GDB_CROSS_PYTHON_BINARY=""
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-# CT_GDB_NATIVE is not set
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
-CT_DEBUG_LTRACE=y
-CT_DEBUG_LTRACE_PKG_KSYM="LTRACE"
-CT_LTRACE_DIR_NAME="ltrace"
-CT_LTRACE_PKG_NAME="ltrace"
-CT_LTRACE_SRC_RELEASE=y
-CT_LTRACE_PATCH_ORDER="global"
-CT_LTRACE_V_0_7_3=y
-# CT_LTRACE_NO_VERSIONS is not set
-CT_LTRACE_VERSION="0.7.3"
-CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace"
-CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig"
-CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2"
-CT_LTRACE_SIGNATURE_FORMAT=""
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
+# CT_DEBUG_LTRACE is not set
+# CT_LTRACE_SRC_RELEASE is not set
+# CT_LTRACE_V_0_7_3 is not set
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -542,13 +478,6 @@ CT_STRACE_V_5_4=y
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -742,8 +671,6 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_LIBELF_TARGET=y
-CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
@@ -752,7 +679,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/crosstool/templates/rpi_armv8 b/support/crosstool/templates/rpi_armv8
index 418c3af..b1a582c 100644
--- a/support/crosstool/templates/rpi_armv8
+++ b/support/crosstool/templates/rpi_armv8
@@ -440,88 +440,24 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
-CT_GDB_CROSS_PYTHON_BINARY=""
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-# CT_GDB_NATIVE is not set
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
-CT_DEBUG_LTRACE=y
-CT_DEBUG_LTRACE_PKG_KSYM="LTRACE"
-CT_LTRACE_DIR_NAME="ltrace"
-CT_LTRACE_PKG_NAME="ltrace"
-CT_LTRACE_SRC_RELEASE=y
-CT_LTRACE_PATCH_ORDER="global"
-CT_LTRACE_V_0_7_3=y
-# CT_LTRACE_NO_VERSIONS is not set
-CT_LTRACE_VERSION="0.7.3"
-CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace"
-CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig"
-CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2"
-CT_LTRACE_SIGNATURE_FORMAT=""
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
+# CT_DEBUG_LTRACE is not set
+# CT_LTRACE_SRC_RELEASE is not set
+# CT_LTRACE_V_0_7_3 is not set
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -538,13 +474,6 @@ CT_STRACE_V_5_4=y
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -738,8 +667,6 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_LIBELF_TARGET=y
-CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
@@ -748,7 +675,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/crosstool/templates/vuplus4k_arm b/support/crosstool/templates/vuplus4k_arm
index 1932e99..4f878b3 100644
--- a/support/crosstool/templates/vuplus4k_arm
+++ b/support/crosstool/templates/vuplus4k_arm
@@ -433,87 +433,24 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
 CT_ALL_CC_CHOICES="GCC"
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_15=y
-# CT_DUMA_NO_VERSIONS is not set
-CT_DUMA_VERSION="2_5_15"
-CT_DUMA_MIRRORS="http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}"
-CT_DUMA_ARCHIVE_FILENAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_8_3=y
+# CT_DEBUG_DUMA is not set
+# CT_DUMA_SRC_RELEASE is not set
+# CT_DUMA_V_2_5_15 is not set
+# CT_DEBUG_GDB is not set
+# CT_GDB_USE_GNU is not set
+# CT_GDB_SRC_RELEASE is not set
+# CT_GDB_V_8_3 is not set
 # CT_GDB_V_8_2 is not set
 # CT_GDB_V_8_1 is not set
 # CT_GDB_V_8_0 is not set
 # CT_GDB_V_7_12 is not set
 # CT_GDB_V_7_11 is not set
-# CT_GDB_NO_VERSIONS is not set
-CT_GDB_VERSION="8.3.1"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-# CT_GDB_CROSS_PYTHON is not set
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-CT_GDB_NATIVE=y
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_BUILD_IPA_LIB is not set
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
-CT_DEBUG_LTRACE=y
-CT_DEBUG_LTRACE_PKG_KSYM="LTRACE"
-CT_LTRACE_DIR_NAME="ltrace"
-CT_LTRACE_PKG_NAME="ltrace"
-CT_LTRACE_SRC_RELEASE=y
-CT_LTRACE_PATCH_ORDER="global"
-CT_LTRACE_V_0_7_3=y
-# CT_LTRACE_NO_VERSIONS is not set
-CT_LTRACE_VERSION="0.7.3"
-CT_LTRACE_MIRRORS="http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace"
-CT_LTRACE_ARCHIVE_FILENAME="@{pkg_name}_@{version}.orig"
-CT_LTRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LTRACE_ARCHIVE_FORMATS=".tar.bz2"
-CT_LTRACE_SIGNATURE_FORMAT=""
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-CT_STRACE_PKG_NAME="strace"
-CT_STRACE_SRC_RELEASE=y
-CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_5_4=y
+# CT_DEBUG_LTRACE is not set
+# CT_LTRACE_SRC_RELEASE is not set
+# CT_LTRACE_V_0_7_3 is not set
+# CT_DEBUG_STRACE is not set
+# CT_STRACE_SRC_RELEASE is not set
+# CT_STRACE_V_5_4 is not set
 # CT_STRACE_V_5_3 is not set
 # CT_STRACE_V_5_2 is not set
 # CT_STRACE_V_5_1 is not set
@@ -530,13 +467,6 @@ CT_STRACE_V_5_4=y
 # CT_STRACE_V_4_17 is not set
 # CT_STRACE_V_4_16 is not set
 # CT_STRACE_V_4_15 is not set
-# CT_STRACE_NO_VERSIONS is not set
-CT_STRACE_VERSION="5.4"
-CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION}"
-CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # CT_COMPLIBS_CHECK is not set
 # CT_COMP_LIBS_CLOOG is not set
@@ -730,11 +660,7 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_LIBELF_TARGET=y
-CT_EXPAT_NEEDED=y
-CT_EXPAT_TARGET=y
 CT_NCURSES_NEEDED=y
-CT_NCURSES_TARGET=y
 CT_ZLIB_NEEDED=y
 CT_LIBICONV=y
 CT_GETTEXT=y
@@ -742,7 +668,6 @@ CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # CT_COMP_TOOLS_FOR_HOST is not set
diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain
index c66caa4..2782ca2 100755
--- a/support/functions/_plugin_update_toolchain
+++ b/support/functions/_plugin_update_toolchain
@@ -5,7 +5,7 @@
 tcupdate(){
 	clear && _check_bin;
 	
-	pversion="0.9.1";
+	pversion="0.9.2";
 	pname="s3.TUP";
 	pdesc="Plugin $pname v$pversion";
 	configname="$configdir/plugin_update_toolchain.config";
@@ -53,7 +53,8 @@ tcupdate(){
 				for i in "${INST_TCLIST[@]}";do
 					if [ ! "$i" == "native" ];then
 						source "$tccfgdir/$i";
-						MENU_OPTIONS+=("$_toolchainname" "$_description" "toolchain folder:$tcdir/$i | config file:$tccfgdir/$i");
+						[ -f "$tcdir/$i/build.log.bz2" ] && tcdate=" ct-ng."$(date -r "$tcdir/$i/build.log.bz2" "+%Y-%m-%d %H:%M:%S") || tcdate="";
+						MENU_OPTIONS+=("$_toolchainname" "$_description\Z2$tcdate\Zn" "toolchain folder:$tcdir/$i | config file:$tccfgdir/$i");
 						counter;
 					fi;
 				done;
@@ -453,7 +454,7 @@ _replace_tokens(){
 						s#@PREFIX@#$prefixdir#g; \
 						s#@HOST@#$hostname#g; \
 						s#@CTNGSOURCE@#$ctsrcdir#g; \
-						s#@VALIDATE@#$_check_lib#g; \
+						s#@VALIDATE@#_check_lib#g; \
 						s#@LOGFILE@#$logfile#g";
 };
 _tidy_tasks(){