diff --git a/support/crosstool/templates/ar71xx_mips b/support/crosstool/templates/ar71xx_mips index 8e84c60..2f92423 100644 --- a/support/crosstool/templates/ar71xx_mips +++ b/support/crosstool/templates/ar71xx_mips @@ -37,7 +37,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/ath79_mips b/support/crosstool/templates/ath79_mips index 25e1747..5efe59e 100644 --- a/support/crosstool/templates/ath79_mips +++ b/support/crosstool/templates/ath79_mips @@ -37,7 +37,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/dream_aarch64 b/support/crosstool/templates/dream_aarch64 index fc0cdbc..c9eab1f 100644 --- a/support/crosstool/templates/dream_aarch64 +++ b/support/crosstool/templates/dream_aarch64 @@ -36,7 +36,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/dream_arm b/support/crosstool/templates/dream_arm index 63e9291..fe14bc2 100644 --- a/support/crosstool/templates/dream_arm +++ b/support/crosstool/templates/dream_arm @@ -36,7 +36,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/dream_mipsel b/support/crosstool/templates/dream_mipsel index 3cb36ac..6a4b548 100644 --- a/support/crosstool/templates/dream_mipsel +++ b/support/crosstool/templates/dream_mipsel @@ -36,7 +36,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/ds126play_armv7 b/support/crosstool/templates/ds126play_armv7 index b19a9b2..bd5a729 100644 --- a/support/crosstool/templates/ds126play_armv7 +++ b/support/crosstool/templates/ds126play_armv7 @@ -36,7 +36,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/rpi_armv6 b/support/crosstool/templates/rpi_armv6 index c253ea8..ce0e8ed 100644 --- a/support/crosstool/templates/rpi_armv6 +++ b/support/crosstool/templates/rpi_armv6 @@ -36,7 +36,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/rpi_armv7 b/support/crosstool/templates/rpi_armv7 index 3077942..e8c7920 100644 --- a/support/crosstool/templates/rpi_armv7 +++ b/support/crosstool/templates/rpi_armv7 @@ -40,7 +40,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/rpi_armv8 b/support/crosstool/templates/rpi_armv8 index 8e3de0a..418c3af 100644 --- a/support/crosstool/templates/rpi_armv8 +++ b/support/crosstool/templates/rpi_armv8 @@ -36,7 +36,7 @@ CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TA CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/crosstool/templates/vuplus4k_arm b/support/crosstool/templates/vuplus4k_arm index e1d3b84..1932e99 100644 --- a/support/crosstool/templates/vuplus4k_arm +++ b/support/crosstool/templates/vuplus4k_arm @@ -36,7 +36,7 @@ CT_PREFIX_DIR="/opt/s3/support/toolchains/vuplus4k_arm" CT_RM_RF_PREFIX_DIR=y CT_REMOVE_DOCS=y CT_INSTALL_LICENSES=y -CT_PREFIX_DIR_RO=y +# CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y # CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set CT_DOWNLOAD_AGENT_WGET=y diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index 7f5a4bf..c66caa4 100755 --- a/support/functions/_plugin_update_toolchain +++ b/support/functions/_plugin_update_toolchain @@ -5,7 +5,7 @@ tcupdate(){ clear && _check_bin; - pversion="0.9.0"; + pversion="0.9.1"; pname="s3.TUP"; pdesc="Plugin $pname v$pversion"; configname="$configdir/plugin_update_toolchain.config"; @@ -453,7 +453,8 @@ _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(){ echo -e "$1" | sed -e "s#$2"_tasks=\(\""##g; \ @@ -578,7 +579,7 @@ _create_config(){ "#Displayname" "#Versionnumber" "#Filename and optional version number to check in pkgconfig folder for an existing library to get version information" - "#Valid URL for downloading sources of library\n#List of build commands below. Pay attention to the SEMICOLON at the end of EACH\n#command and the correct quoting (' or \") for or to avoid expansion of variables.\n#Tokens @TOOLCHAIN@, @CC@, @RANLIB@, @PREFIX@, @HOST@, @VALIDATE@ are replaced automatically." + "#Valid URL for downloading sources of library\n#List of build commands below. Pay attention to the SEMICOLON at the end of EACH\n#command and the correct quoting (' or \") for or to avoid expansion of variables.\n#Tokens @TOOLCHAIN@, @CC@, @RANLIB@, @PREFIX@, @HOST@, @VALIDATE@, @LOGFILE@ are replaced automatically." "#build command" ); lib_settings=( "" name version check url tasks ); lib_keys=( SAMPLE_LIB SSL_111 SSL_110 SSL_102 SSL_100 SSL_098 LIB_USB LIB_PCSC LIB_ZLIB ); @@ -612,17 +613,17 @@ _create_config(){ '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/ --host=@HOST@ --disable-libudev --disable-libsystemd LIBUSB_LIBS=\\\"-L@PREFIX@/lib -lusb-1.0 -lrt\\\" LIBUSB_CFLAGS=\\\"-I@PREFIX@/include/libusb-1.0\\\";\")" "(\"make;\")" "(\"make install;\")" "(\"@VALIDATE@ \"PCSC\";\")" )' '( "(\"export TOOLCHAIN=@TOOLCHAIN@;\")" "(\"export CC=@CC@;\")" "('"'"'export PATH=\"\$TOOLCHAIN/bin:\$PATH\";'"'"')" "(\"./configure --prefix=@PREFIX@/;\")" "(\"make;\")" "(\"make install;\")" )' ); - ctng_build_tasks=( "(\"./ct-ng upgradeconfig;\")" "(\"./ct-ng show-config;\")" "(\"./ct-ng build;\")" ); + ctng_build_tasks=( "(\"./ct-ng upgradeconfig | tee -a \"@LOGFILE@\";\")" "(\"./ct-ng show-config | tee -a \"@LOGFILE@\";\")" "(\"./ct-ng build;\")" ); ctng_build_tasks_comment="#build command"; ctng_setup_tasks=( "(\"git clone --progress \"\$CTNG_REPO_URL\" \"@CTNGSOURCE@\";\")" "(\"./bootstrap;\")" "(\"./configure --enable-local;\")" "(\"make;\")" ); ctng_setup_tasks_comment="#setup command"; echo '#CROSS toolchain build settings' >"$configname"; echo 'CTNG_REPO_URL="https://github.com/crosstool-ng/crosstool-ng"; #Repository to load ct-ng from' >>"$configname"; - echo 'CTNG_BUILD_AS_ROOT="0"; #You normally do *not* need to be root to build a toolchain using crosstool-NG. In fact, it is *VERY* dangerous to run as root, as crosstool-NG will, as part of the build process, remove a few directories. If anything goes wrong, running as root can ruin your host distribution.' >>"$configname"; + echo 'CTNG_BUILD_AS_ROOT="0"; #Enable/Disable (1|0); You normally do *not* need to be root to build a toolchain using crosstool-NG. In fact, it is *VERY* dangerous to run as root, as crosstool-NG will, as part of the build process, remove a few directories. If anything goes wrong, running as root can ruin your host distribution.' >>"$configname"; echo '#List of build and setup commands below. Pay attention to the SEMICOLON at the end of EACH' >>"$configname"; echo '#command and the correct quoting ('"'"' or ") for or to avoid expansion of variables.' >>"$configname"; - echo '#Tokens @CTNGSOURCE@ are replaced automatically. The commands are executed in the context of the current user.' >>"$configname"; + echo '#Tokens @CTNGSOURCE@, @LOGFILE@ are replaced automatically. The commands are executed in the context of the current user.' >>"$configname"; i=0; for bt in "${ctng_build_tasks[@]}"; do