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

fix toolchain check

pull/9/head
root 6 years ago
parent
7ead40a844
commit
123b4a8de0
10 changed files with 44 additions and 27 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. 6
      s3
  2. 2
      support/configs/compiler_option
  3. 31
      support/functions/_toolchain
  4. 2
      support/toolchains.cfg/mipsel_s3_ssl098
  5. 2
      support/toolchains.cfg/mipsel_s3_ssl100
  6. 4
      support/toolchains.cfg/mipsel_s3_ssl102
  7. 4
      support/toolchains.cfg/solo4k
  8. 4
      support/translation/de
  9. 4
      support/translation/en

6
s3
View File

@ -224,24 +224,29 @@ else
for t in "${AVAI_TCLIST[@]}";do for t in "${AVAI_TCLIST[@]}";do
if [ "$t" == "$1" ];then if [ "$t" == "$1" ];then
if [ "${2:0:3}" == "-p=" ] || [ "${2:0:3}" == "-P=" ];then if [ "${2:0:3}" == "-p=" ] || [ "${2:0:3}" == "-P=" ];then
if [ -f "$profdir/${2#*=}" ];then if [ -f "$profdir/${2#*=}" ];then
pf=$(cat "$profdir/${2#*=}"); pf=$(cat "$profdir/${2#*=}");
pf_name="${2#*=}"; pf_name="${2#*=}";
fi; fi;
fi; fi;
if [ "${3:0:3}" == "-p=" ] || [ "${3:0:3}" == "-P=" ];then if [ "${3:0:3}" == "-p=" ] || [ "${3:0:3}" == "-P=" ];then
if [ -f "$profdir/${2#*=}" ];then if [ -f "$profdir/${2#*=}" ];then
pf=$(cat "$profdir/${2#*=}"); pf=$(cat "$profdir/${2#*=}");
pf_name="${2#*=}"; pf_name="${2#*=}";
fi; fi;
fi; fi;
if [ "${2:0:5}" == "-upx=" ] || [ "${2:0:5}" == "-UPX=" ];then if [ "${2:0:5}" == "-upx=" ] || [ "${2:0:5}" == "-UPX=" ];then
UPX=${2#*=};USE_vars[USE_COMPRESS]="USE_COMPRESS=1"; UPX=${2#*=};USE_vars[USE_COMPRESS]="USE_COMPRESS=1";
fi; fi;
if [ "${2:0:5}" == "-upx=" ] || [ "${2:0:5}" == "-UPX=" ];then if [ "${2:0:5}" == "-upx=" ] || [ "${2:0:5}" == "-UPX=" ];then
UPX=${2#*=};USE_vars[USE_COMPRESS]="USE_COMPRESS=1"; UPX=${2#*=};USE_vars[USE_COMPRESS]="USE_COMPRESS=1";
fi; fi;
[ "$pf" == "empty" ] && c_m_d="$*" || c_m_d="all_off $pf $*"; # set only active module with profiles [ "$pf" == "empty" ] && c_m_d="$*" || c_m_d="all_off $pf $*"; # set only active module with profiles
for cmd in $c_m_d;do for cmd in $c_m_d;do
if [ "${cmd:0:3}" == "-c=" ] || [ "${cmd:0:3}" == "-C=" ];then if [ "${cmd:0:3}" == "-c=" ] || [ "${cmd:0:3}" == "-C=" ];then
@ -271,6 +276,7 @@ else
USE_VERBOSE) s3cfg_vars[USE_VERBOSE]=1;; USE_VERBOSE) s3cfg_vars[USE_VERBOSE]=1;;
esac; esac;
done; done;
_pre_build "$t"; _pre_build "$t";
exit; exit;
fi; fi;

2
support/configs/compiler_option
View File

@ -1 +1 @@
-O1 -Os

31
support/functions/_toolchain
View File

@ -147,7 +147,7 @@ _console_extract_toolchain(){
_toolchain_check(){ _toolchain_check(){
clear; clear;
echo -e "$w_l"; echo -e "$w_l";
ologo; s3logo;
headervars=( crypto.h pcsclite.h libusb.h pthread.h ); headervars=( crypto.h pcsclite.h libusb.h pthread.h );
[ -f "$tccfgdir/$1" ] && source "$tccfgdir/$1"; [ -f "$tccfgdir/$1" ] && source "$tccfgdir/$1";
if [ -d "$tcdir/$1/bin" ];then if [ -d "$tcdir/$1/bin" ];then
@ -162,17 +162,24 @@ _toolchain_check(){
version=$("./$compilername" -dumpversion); version=$("./$compilername" -dumpversion);
machine=$("./$compilername" -dumpmachine); machine=$("./$compilername" -dumpmachine);
sr=$("./$compilername" -print-sysroot 2>/dev/null); sr=$("./$compilername" -print-sysroot 2>/dev/null);
sysroot=${tcdir//"$1/bin"/}; sysroot=${sr#"$tcdir/$1/bin/../"};
[ -z "$sysroot" ] && sysroot="$r_l$txt_too_old"; [ -z "$sysroot" ] && sysroot="$r_l$txt_too_old";
echo -e "$w_l Compiler Info\n =============\n"; echo -e "$w_l Compiler Info -----> $C$1$w_l\n ====================\n";
echo -e "$w_l Version :$y_l $version"; echo -e "$w_l GCC Version :$y_l $version";
echo -e "$w_l Target :$y_l $machine"; echo -e "$w_l GCC Binary :$y_l $machine""-gcc";
echo -e "$w_l Sysroot :$y_l $sysroot"; echo -e "$w_l GCC Sysroot :$y_l $sysroot";
cd "$sr";
for e in "${headervars[@]}";do for e in "${headervars[@]}";do
temp=$(find "$sr"/* |grep -m1 "$e"); temp=$(find * |grep -m1 "$e");
[ ${#temp} -gt 8 ] && echo -e "$w_l Header :$y_l $e$g_l\t$txt_found" || echo -e "$w_l Header :$y_l $e$r_l\t($txt_not_found)"; [ ${#temp} -gt 8 ] && echo -e "$w_l Header File :$y_l $e$g_l\t$txt_found" || echo -e "$w_l Header File :$y_l $e$r_l\t($txt_not_found)";
done; done;
_nl; echo -e "\n$w_l Sysroot config ----> $C$_sysroot$w_l\n ====================\n";
cd "$tcdir/$1/$_sysroot";
for e in "${headervars[@]}";do
temp=$(find * |grep -m1 "$e");
[ ${#temp} -gt 8 ] && echo -e "$w_l Header File :$y_l $e$g_l\t$txt_found" || echo -e "$w_l Header File :$y_l $e$r_l\t($txt_not_found)";
done;
echo -e $re_;
exit; exit;
}; };
_toolchain_repair(){ _toolchain_repair(){
@ -182,6 +189,10 @@ _toolchain_repair(){
cd $dldir;zzusatz=0;szusatz=0; cd $dldir;zzusatz=0;szusatz=0;
[ -f "$tccfgdir/$1" ] && source "$tccfgdir/$1"; [ -f "$tccfgdir/$1" ] && source "$tccfgdir/$1";
fn=$(echo $_md5sum |awk '{ printf $2 }'); fn=$(echo $_md5sum |awk '{ printf $2 }');
if [ ${#_md5sum} -lt 1 ];then
echo -e $w_l" md5sum in $Y$1$w_l config $R$txt_not_found$W\n\n";
exit;
fi;
if [ -f $fn ];then if [ -f $fn ];then
md5file=$(mktemp); md5file=$(mktemp);
echo $_md5sum > $md5file; echo $_md5sum > $md5file;
@ -196,7 +207,7 @@ _toolchain_repair(){
else else
echo -en $w_l"\n Toolchain md5 check :$r_l"; echo -en $w_l"\n Toolchain md5 check :$r_l";
echo -en $answer |awk '{{print " " $2;}}' |head -1; echo -en $answer |awk '{{print " " $2;}}' |head -1;
echo -en $W;sleep 1;zzusatz=0;szusatz=8; echo -en $W;sleep 1;zzusatz=1;szusatz=8;
echo -en $w_l" Toolchain download :$g_l"; echo -en $w_l" Toolchain download :$g_l";
dln=$fn;_pget; sleep 1; dln=$fn;_pget; sleep 1;
echo -en $w_l" Toolchain repair :$g_l"; echo -en $w_l" Toolchain repair :$g_l";

2
support/toolchains.cfg/mipsel_s3_ssl098
View File

@ -5,7 +5,7 @@ _oscamconfdir_default="/var/keys";
_oscamconfdir_custom="" _oscamconfdir_custom=""
_compiler="mipsel-simplebuild3-linux-gnu-"; _compiler="mipsel-simplebuild3-linux-gnu-";
_sysroot="/"; _sysroot="mipsel-simplebuild3-linux-gnu/sysroot";
_libsearchdir="/lib"; _libsearchdir="/lib";
_toolchainfilename="bWlwc2VsX3MzX3NzbDA5OC50YXIueHoK"; _toolchainfilename="bWlwc2VsX3MzX3NzbDA5OC50YXIueHoK";
_md5sum="966c590d2178f6d401c93993eba4f7f9 Toolchain-mipsel_s3_ssl098.tar.xz"; _md5sum="966c590d2178f6d401c93993eba4f7f9 Toolchain-mipsel_s3_ssl098.tar.xz";

2
support/toolchains.cfg/mipsel_s3_ssl100
View File

@ -5,7 +5,7 @@ _oscamconfdir_default="/var/keys";
_oscamconfdir_custom="" _oscamconfdir_custom=""
_compiler="mipsel-simplebuild3-linux-gnu-"; _compiler="mipsel-simplebuild3-linux-gnu-";
_sysroot="/"; _sysroot="mipsel-simplebuild3-linux-gnu/sysroot";
_libsearchdir="/lib"; _libsearchdir="/lib";
_toolchainfilename="bWlwc2VsX3MzX3NzbDEwMC50YXIueHoK"; _toolchainfilename="bWlwc2VsX3MzX3NzbDEwMC50YXIueHoK";
_md5sum="b1ff681eff62b0e639d37e001b97e1e0 Toolchain-mipsel_s3_ssl100.tar.xz"; _md5sum="b1ff681eff62b0e639d37e001b97e1e0 Toolchain-mipsel_s3_ssl100.tar.xz";

4
support/toolchains.cfg/mipsel_s3_ssl102
View File

@ -5,10 +5,10 @@ _oscamconfdir_default="/var/keys";
_oscamconfdir_custom="" _oscamconfdir_custom=""
_compiler="mipsel-simplebuild3-linux-gnu-"; _compiler="mipsel-simplebuild3-linux-gnu-";
_sysroot="/"; _sysroot="mipsel-simplebuild3-linux-gnu/sysroot";
_libsearchdir="/lib"; _libsearchdir="/lib";
_toolchainfilename="bWlwc2VsX3MzX3NzbDEwMi50YXIueHoK"; _toolchainfilename="bWlwc2VsX3MzX3NzbDEwMi50YXIueHoK";
md5sum="985ba51ae41cacd008fb6c7490e2f287 Toolchain-mipsel_s3_ssl102.tar.xz" _md5sum="985ba51ae41cacd008fb6c7490e2f287 Toolchain-mipsel_s3_ssl102.tar.xz"
_tc_info="\n _tc_info="\n
!!! generic mipsel ssl 1.0.2 !!!\n !!! generic mipsel ssl 1.0.2 !!!\n
this toolchain is compatible with\n this toolchain is compatible with\n

4
support/toolchains.cfg/solo4k
View File

@ -5,10 +5,10 @@ _oscamconfdir_default="/var/tuxbox/config";
_oscamconfdir_custom="" _oscamconfdir_custom=""
_compiler="arm-linux-gnueabihf-"; _compiler="arm-linux-gnueabihf-";
_sysroot="arm-linux-gnueabihf"; _sysroot="arm-linux-gnueabihf/";
_libsearchdir="/lib"; _libsearchdir="/lib";
_toolchainfilename="c29sbzRrLnRhci54ego="; _toolchainfilename="c29sbzRrLnRhci54ego=";
_md5sum="74d4de6ac2f4812426635cf54e3d85fa Toolchain-solo4k.tar.xz";
_tc_info="\n _tc_info="\n
!!! beware the box must have FPU !!!\n !!! beware the box must have FPU !!!\n
this toolchain is compatible with\n this toolchain is compatible with\n

4
support/translation/de
View File

@ -20,12 +20,12 @@ txt_sel='auswählen';
txt_delete='lösche'; txt_delete='lösche';
txt_found='gefunden'; txt_found='gefunden';
txt_create='erstelle'; txt_create='erstelle';
txt_loading=' lade'; txt_loading=' lade'; #8 zeichen
txt_profile='Profil'; txt_profile='Profil';
txt_profiles='Profile'; txt_profiles='Profile';
txt_conf='Konfiguration'; txt_conf='Konfiguration';
txt_parameter='Parameter'; txt_parameter='Parameter';
txt_extracting='entpacke'; txt_extracting=' entpacke'; #10 zeichen
txt_wait='bitte warten...'; txt_wait='bitte warten...';
txt_existing='vorhandenen'; txt_existing='vorhandenen';
txt_ssh_profiles='SSH $txt_profiles'; txt_ssh_profiles='SSH $txt_profiles';

4
support/translation/en
View File

@ -15,13 +15,13 @@ txt_no='no';
txt_use='use'; txt_use='use';
txt_back='back'; txt_back='back';
txt_error='error'; txt_error='error';
txt_loading=' load'; txt_loading=' load'; #8 chars
txt_sel='select'; txt_sel='select';
txt_delete='delete'; txt_delete='delete';
txt_found='found'; txt_found='found';
txt_create='create'; txt_create='create';
txt_conf='configuration'; txt_conf='configuration';
txt_extracting='extracting'; txt_extracting='extracting'; #10 chars
txt_wait='please wait...'; txt_wait='please wait...';
txt_existing='exists'; txt_existing='exists';
txt_profiles='profiles'; txt_profiles='profiles';

Write Preview
Loading…
Cancel
Save