|
|
|
@ -3,7 +3,7 @@ |
|
|
|
#simplebuild_plugin tcupdate |
|
|
|
|
|
|
|
tcupdate(){ |
|
|
|
pversion="0.22.1"; |
|
|
|
pversion="0.22.3"; |
|
|
|
pname="s3.TUP"; |
|
|
|
pdesc="Plugin $pname v$pversion"; |
|
|
|
configname="$configdir/plugin_update_toolchain.config"; |
|
|
|
@ -127,7 +127,6 @@ tcupdate(){ |
|
|
|
#TOOLCHAIN MENU |
|
|
|
_fill_tc_array; |
|
|
|
unset MENU_OPTIONS;COUNT=0 |
|
|
|
if [ "$systype" == "ok" ];then |
|
|
|
if [ "$tcempty" == "0" ];then |
|
|
|
for i in "${INST_TCLIST[@]}";do |
|
|
|
if [ ! "$i" == "native" ];then |
|
|
|
@ -139,7 +138,6 @@ tcupdate(){ |
|
|
|
done; |
|
|
|
fi; |
|
|
|
[ $COUNT -eq 0 ] && MENU_OPTIONS+=("" "$txt_s3tup_menu_toolchain_notfound" "$txt_s3tup_menu_toolchain_notfound"); |
|
|
|
fi; |
|
|
|
clear;clear; |
|
|
|
out=$("$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--item-help" "--help-tags" "--default-item" "$tc" "--ok-label" "${txt_s3tup_menu_command_label_update}" "--cancel-label" "${txt_s3tup_menu_command_label_create}" "--help-button" "--help-label" "${txt_s3tup_menu_command_label_backup}" "--extra-button" "--extra-label" "$([ ! "$FLAG" == "1" ] && echo "${txt_s3tup_menu_command_label_exit}" || echo "${txt_s3tup_menu_command_label_back}")" "--title" "-[ ${txt_s3tup_menu_toolchain_title} ]-" \ |
|
|
|
--menu "\n${txt_s3tup_menu_toolchain_text1} $COUNT ${txt_s3tup_menu_toolchain_text2}\n " \ |
|
|
|
@ -320,7 +318,7 @@ _integrate_libs(){ |
|
|
|
_create_tc(){ |
|
|
|
_sz; # Prepare DIALOG settings |
|
|
|
unset TPL_LIST; |
|
|
|
local menu_close libkeys use; |
|
|
|
local menu_close libkeys use ldf; |
|
|
|
while [ ! $menu_close ] |
|
|
|
do |
|
|
|
if [ "${#2}" -gt 0 ];then #Force setup call |
|
|
|
@ -489,7 +487,6 @@ _create_tc(){ |
|
|
|
case "$tpl_type" in |
|
|
|
"CTNG") #get target from build.log |
|
|
|
target=$(sed -n -e '/target = / s/.*\= *//p' "$ctsrcdir/build.log"); |
|
|
|
use=""; |
|
|
|
|
|
|
|
#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"); |
|
|
|
@ -498,7 +495,8 @@ _create_tc(){ |
|
|
|
btcbindir=$(grep -i '{ PATH=.*kernel.*' "$logfile" | head -n 1 | awk -F':|"' '{print $2}'); |
|
|
|
btcdir=$(realpath "$btcbindir/../"); |
|
|
|
target=$(basename "$btcdir"); |
|
|
|
use=""; |
|
|
|
#autodetect LDFLAGS depending on the freetz-ng configuration options |
|
|
|
[ $(grep -i '^FREETZ_AVM_PROP_UCLIBC_SEPARATE=y' "$ctsrcdir/.config") ] && ldf="-Wl,-dynamic-linker,${FNG_SEPARATE_DYNAMIC_LINKER}"; |
|
|
|
|
|
|
|
#copy toolchain folder |
|
|
|
rm -rf "$tcdir/$tpl"; |
|
|
|
@ -533,8 +531,9 @@ _create_tc(){ |
|
|
|
props=$(_get_template_properties "$cttpldir/$tpl"); |
|
|
|
desc=$(echo "$props" | awk -F'^' '{print $1}' | xargs); |
|
|
|
cflags=$(echo "$props" | awk -F'^' '{print $3}' | xargs); |
|
|
|
ldflags=$(echo "$props" | awk -F'^' '{print $4}' | xargs); |
|
|
|
_create_toolchaincfg "$tcdir/$tpl" "$tpl" "$target" "$sysroot" "" "$desc" "" "$dldir/$(decode "$_t1e")$tpl.tar.xz" "yes" "$tpl_type_name" "$use" "$cflags" "$ldflags" "$tpl_type"; |
|
|
|
[ -z "$ldf" ] && ldf=$(echo "$props" | awk -F'^' '{print $4}' | xargs); |
|
|
|
|
|
|
|
_create_toolchaincfg "$tcdir/$tpl" "$tpl" "$target" "$sysroot" "" "$desc" "" "$dldir/$(decode "$_t1e")$tpl.tar.xz" "yes" "$tpl_type_name" "$use" "$cflags" "$ldf" "$tpl_type"; |
|
|
|
else |
|
|
|
_paktc_timer 10; |
|
|
|
fi; |
|
|
|
@ -995,8 +994,8 @@ _list_toolchain_libkeys(){ |
|
|
|
do |
|
|
|
if [ -d "$tcdir/$tc" ];then |
|
|
|
#print out table header |
|
|
|
[ -z "$props" -a -z "$2" ] && printf "\n%-30s %-45s %-30s %s\n" "${txt_tc}" "${txt_s3tup_msg_table_header_libs_col_key}" "${txt_s3tup_msg_table_header_libs_col_update}" "${txt_s3tup_msg_table_header_libs_col_downgrade}" |
|
|
|
[ -z "$props" -a -n "$2" ] && printf "\n%-30s %-11s %21s %3s %-12s %-10s %s\n" "${txt_tc}" "${txt_s3tup_msg_table_header_libsversion_col_key}" "${txt_s3tup_msg_table_header_libsversion_col_curversion}" "" "${txt_s3tup_msg_table_header_libsversion_col_newversion}" "${txt_s3tup_msg_table_header_libsversion_col_update}" "${txt_s3tup_msg_table_header_libsversion_col_downgrade}" |
|
|
|
[ -z "$props" -a -z "$2" ] && printf "${bk_n}${lg_lb}\n%-30s %-45s %-30s %s${re_}" "${txt_tc}" "${txt_s3tup_msg_table_header_libs_col_key}" "${txt_s3tup_msg_table_header_libs_col_update}" "${txt_s3tup_msg_table_header_libs_col_downgrade}" |
|
|
|
[ -z "$props" -a -n "$2" ] && printf "${bk_n}${lg_lb}\n%-30s %-11s %21s %3s %-12s %-10s %s${re_}" "${txt_tc}" "${txt_s3tup_msg_table_header_libsversion_col_key}" "${txt_s3tup_msg_table_header_libsversion_col_curversion}" "" "${txt_s3tup_msg_table_header_libsversion_col_newversion}" "${txt_s3tup_msg_table_header_libsversion_col_update}" "${txt_s3tup_msg_table_header_libsversion_col_downgrade}" |
|
|
|
|
|
|
|
#get toolchain properties |
|
|
|
props=$(_get_toolchain_properties "$tc"); |
|
|
|
@ -1034,8 +1033,9 @@ _list_toolchain_libkeys(){ |
|
|
|
newversion="${fmt}${newversion::16}${re_}"; |
|
|
|
[ -z "$update" ] && update="-" || P2=1; |
|
|
|
[ -z "$downgrade" ] && downgrade="-"; |
|
|
|
fmt="%-30s %-$((11+$ADD))b %$((21+$ADD))b %-$((1+$ADD))b %-$((16+$ADD))b %-$((11+$ADD*$P2))b %b\n"; |
|
|
|
printf "$fmt" "${tc::30}" "$libkey" "$curversion" "$compare" "$newversion" "$update" "$downgrade"; |
|
|
|
[ -n "$tc" ] && fmt="\n" |
|
|
|
fmt="${fmt}%-30s %-$((11+$ADD))b %$((21+$ADD))b %-$((1+$ADD))b %-$((16+$ADD))b %-$((11+$ADD*$P2))b %b\n"; |
|
|
|
printf "$fmt" "$NL${tc::30}" "$libkey" "$curversion" "$compare" "$newversion" "$update" "$downgrade"; |
|
|
|
fi; |
|
|
|
done; |
|
|
|
|
|
|
|
@ -1047,7 +1047,7 @@ _list_toolchain_libkeys(){ |
|
|
|
[ "$R" -gt 0 ] && downgradable="${downgradable%?}"; |
|
|
|
[ -z "$downgradable" ] && downgradable="-"; |
|
|
|
|
|
|
|
fmt="%-30s %-$((45+$ADD*$CUR))b %-$((30+$ADD*$P))b %b\n"; |
|
|
|
fmt="\n%-30s %-$((45+$ADD*$CUR))b %-$((30+$ADD*$P))b %b"; |
|
|
|
printf "$fmt" "${tc::30}" "${libkeys%?}" "$updatable" "$downgradable"; |
|
|
|
fi; |
|
|
|
fi; |
|
|
|
@ -1129,7 +1129,7 @@ _get_template_properties(){ |
|
|
|
rm -f "$fngsrcdir/.config"; |
|
|
|
else |
|
|
|
setup=0; |
|
|
|
desc="$desc (${txt_s3tup_msg_gtp_info})"; |
|
|
|
desc="$desc ($(printf '%q' "${txt_s3tup_msg_gtp_info}"))"; |
|
|
|
fi;; |
|
|
|
"ANDK") |
|
|
|
if [ -d "$andksrcdir" ];then |
|
|
|
@ -1142,14 +1142,14 @@ _get_template_properties(){ |
|
|
|
kernel="Linux" && kernelv="4.9.0"; |
|
|
|
else |
|
|
|
setup=0; |
|
|
|
desc="$desc (${txt_s3tup_msg_gtp_info})"; |
|
|
|
desc="$desc ($(printf '%q' "${txt_s3tup_msg_gtp_info}"))"; |
|
|
|
fi;; |
|
|
|
esac; |
|
|
|
|
|
|
|
#build template property string |
|
|
|
[ -z $setup ] && desc="$desc ($arch$cpu$aarch $bitness-bit $endianness, $libc $libcmv$libcv, $cc $ccv, $kernel $kernelv)$props"; |
|
|
|
fi; |
|
|
|
echo "$desc" | xargs; |
|
|
|
echo "$desc"; |
|
|
|
[ -n "$desc" ] && exit 0 || exit 1; |
|
|
|
}; |
|
|
|
_get_template_type(){ |
|
|
|
|
Gorgone
5 years ago