topaLE
/
s3_releases_Oscam_Build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

s3.TUP new toolchain config option (v0.10.8) 

Added new toolchain configuration option _self_build to distinguish self-made toolchains from others
some gui beautifying
pull/15/head
WXbet 5 years ago
parent
b090e7f1da
commit
d3120d32ef
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      support/functions/_plugin_update_toolchain

12
support/functions/_plugin_update_toolchain
View File

@ -3,7 +3,7 @@
#simplebuild_plugin tcupdate #simplebuild_plugin tcupdate
tcupdate(){ tcupdate(){
pversion="0.10.7"; pversion="0.10.8";
pname="s3.TUP"; pname="s3.TUP";
pdesc="Plugin $pname v$pversion"; pdesc="Plugin $pname v$pversion";
configname="$configdir/plugin_update_toolchain.config"; configname="$configdir/plugin_update_toolchain.config";
@ -336,7 +336,7 @@ _create_tc(){
target=$(sed -n -e '/target = / s/.*\= *//p' "$ctsrcdir/build.log"); target=$(sed -n -e '/target = / s/.*\= *//p' "$ctsrcdir/build.log");
#compress toolchain #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"; _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";
#create toolchain.cfg #create toolchain.cfg
desc=$(sed -n -e '/#toolchain template/ s/.*\: *//p' "$cttpldir/$tpl"); desc=$(sed -n -e '/#toolchain template/ s/.*\: *//p' "$cttpldir/$tpl");
@ -380,7 +380,7 @@ _create_tc(){
else else
echo -e "\nERROR -> The execution of crosstool-NG was aborted\n because it must not run as root!\n"; echo -e "\nERROR -> The execution of crosstool-NG was aborted\n because it must not run as root!\n";
fi; fi;
) | tee "$logfile" | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Setup crosstool-NG... ]- " "$pb_" "$_lines" "$_cols"; ) | tee "$logfile" | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Setup crosstool-NG ]- " "$pb_" "$_lines" "$_cols";
_paktc_timer 10;; _paktc_timer 10;;
2) #Exit 2) #Exit
menu_close="1"; menu_close="1";
@ -407,7 +407,7 @@ _backup(){
#create toolchain.cfg #create toolchain.cfg
source "$tccfgdir/$src" && target="${_compiler%?}" && sysroot="$_sysroot" && lsd="$_libsearchdir" && desc="$_description" && info="$_tc_info"; source "$tccfgdir/$src" && target="${_compiler%?}" && sysroot="$_sysroot" && lsd="$_libsearchdir" && desc="$_description" && info="$_tc_info";
_create_toolchaincfg "$tcdir/$src" "$dest" "$target" "$sysroot" "$lsd" "$desc" "$info" "$xzfile"; _create_toolchaincfg "$tcdir/$src" "$dest" "$target" "$sysroot" "$lsd" "$desc" "$info" "$xzfile";
) | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Backup $src to $(basename "$xzfile")... ]- " "$pb_" "$_lines" "$_cols"; ) | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Backup $src to $(basename "$xzfile") ]- " "$pb_" "$_lines" "$_cols";
[ -f "$newtccfgfile" ] && echo "$dest"; [ -f "$newtccfgfile" ] && echo "$dest";
}; };
_build(){ _build(){
@ -426,7 +426,7 @@ _build(){
sleep 2; sleep 2;
cd "$libsrcdir"; cd "$libsrcdir";
( eval "${tasks[@]}" ) 2>&1 | tee -a "$lf" ( eval "${tasks[@]}" ) 2>&1 | tee -a "$lf"
) | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Build $desc... ]- " "$pb_" "$_lines" "$_cols";sleep 2; ) | "$gui" "$st_" "$bt_" "$title_ - \Z0$pdesc\Zn" "--colors" "--title" " -[ Build $desc ]- " "$pb_" "$_lines" "$_cols";sleep 2;
#build error message #build error message
error_on_build=$(grep -cw1 Error "$lf"); error_on_build=$(grep -cw1 Error "$lf");
@ -765,7 +765,7 @@ default_use="USE_UTF8 USE_LIBCRYPTO";
_description="$6"; _description="$6";
_oscamconfdir_default="/etc/tuxbox/config"; _oscamconfdir_default="/etc/tuxbox/config";
_oscamconfdir_custom=""; _oscamconfdir_custom="";
_self_build="true";
_compiler="$3-"; _compiler="$3-";
_sysroot="$sysroot"; _sysroot="$sysroot";
_libsearchdir="$lsd"; _libsearchdir="$lsd";

Write Preview
Loading…
Cancel
Save