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

Merge pull request #25 from WXbet/Gorgone 

s3.TUP use s3 package installer (v0.11.4)
pull/26/head
Gorgone 5 years ago
committed by GitHub
parent
c9cd536f3d a0e1df2412
commit
534a173eda
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 117 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      support/functions/_plugin_update_toolchain
  2. 2
      support/functions/_sys_check
  3. 20
      support/os/debian_ubuntu.install
  4. 27
      support/os/manjaro.install
  5. 34
      support/os/redhat_centos_fedora.install
  6. 24
      support/os/suse.install

44
support/functions/_plugin_update_toolchain
View File

@ -3,7 +3,7 @@
#simplebuild_plugin tcupdate
tcupdate(){
pversion="0.11.3";
pversion="0.11.4";
pname="s3.TUP";
pdesc="Plugin $pname v$pversion";
configname="$configdir/plugin_update_toolchain.config";
@ -17,7 +17,7 @@ tcupdate(){
[ -z "$4" ] && FLAG="0" || FLAG="$4"; #1 - tcupdate call from s3 main menu, 2 - tcupdate call from s3 toolchain menu;
tc="$CMDTC";
clear && _check_bin;
clear && _check_pkg;
#backup config
if [ "$CMDTC" == "-r" ] || [ "$CMDTC" == "--reset" ];then
@ -179,7 +179,7 @@ tcupdate(){
[ $COUNT -eq 0 ] && MENU_OPTIONS+=("" "no libraries found" "no libraries found") && counter;
if [ ${#OPTION1} -gt 0 ];then #Force build library call
opts=$(echo "$OPTION1" | tr ',' "\n");
opts=$(echo "$OPTION1" | tr ',' '\n');
ret="0";
else
clear;clear;
@ -303,13 +303,13 @@ _create_tc(){
icount=$(echo $opts | wc -w);i=0;
for tpl in $opts;do
if [ -f "$cttpldir/$tpl" ]; then
logfile="$ldir/$(date +%F)_$(date +%T)_update_toolchain_crosstoolchain_"$tpl".log"; ((i++));
clear;
sp=$(printf '%*s' 80 | tr ' ' '=')
echo -e "$sp\nbuild ($i/$icount): command list for cross toolchain $tpl:\n$sp" | tee -a "$logfile";
echo -e "$y_l$sp\nbuild ($i/$icount): command list for cross toolchain $tpl:\n$sp" | tee -a "$logfile";
#copy template and patching them
echo "rm \"$ctsrcdir/.config\"* 2>/dev/null;cp --no-preserve=mode,ownership -f \"$cttpldir/$tpl\" \"$ctsrcdir/.config\";" | tee -a "$logfile";
rm "$ctsrcdir/.config"* 2>/dev/null;cp --no-preserve=mode,ownership -f "$cttpldir/$tpl" "$ctsrcdir/.config";
@ -326,11 +326,13 @@ _create_tc(){
#run build
bcl=$(printf '%s\n' "${CTNG_BUILD_tasks[@]}");
echo -e "cd \"$ctsrcdir\";\n$(_replace_tokens "$bcl")\n$sp" | tee -a "$logfile";
echo -e "cd \"$ctsrcdir\";\n$(_replace_tokens "$bcl")\n$sp""$re_" | tee -a "$logfile";
sleep 2;
if [ $START_BUILD -eq 1 ]; then
cd "$ctsrcdir";
#print out crosstool-NG version
echo -e "$g_l\n$(./ct-ng | grep 'crosstool-NG version' &2>/dev/null | tail -1)\n""$re_" | tee -a "$logfile";
#generate build command list
unset buildtasks;
for task in "${CTNG_BUILD_tasks[@]}";do
@ -619,7 +621,7 @@ _check_lib(){
case "$1" in
"PCSC") #Create symlink to the PCSC header files, if the last include path of the compiler don't point to it
echo -e "\nCheck for PCSC header files and try to symlink to the correct PCSC header files if the last compiler include path points to the wrong location...";
if [ ${#incdir} -gt 0 ] && [ ! -d "$incdir/PCSC" ]; then
if [ ${#incdir} -gt 0 ] && [ ! -d "$incdir/PCSC" ];then
headerdir="$(dirname $(find "$prefixdir" -type f -name "pcsclite.h" | head -n 1))";
[ ${#headerdir} -gt 0 ] && ln -s "$(realpath --relative-to="$incdir" "$headerdir")" "$incdir/PCSC";
[ ${#headerdir} -gt 0 ] && echo "Symlink $incdir/PCSC -> $headerdir created, to point to the PCSC header files." || "No PCSC header files found in $prefixdir and it's sub directories!";
@ -629,22 +631,14 @@ _check_lib(){
*) echo "not implemented yet!";
esac;
};
_check_bin(){
bins=( git curl jq gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
patch libstdc++6 rsync );
failed=0;
for e in "${bins[@]}";
do
dpkg -s "$e" &>/dev/null;
if [ ! "$?" -eq "0" ];then
packages="$packages $e";
failed=1;
fi;
done;
[ "$failed" == 1 ] && echo -e "$r_l""\nCHECK -> You need to install the following tools to use this plugin properly:\n"$y_l"apt install$packages\n""$re_" && _paktc_timer 10;
return $failed;
_check_pkg(){
pkgs=( git patch curl jq gcc g++ gperf bison flex makeinfo help2man make file cmp \
python3-config autoconf automake libtoolize libtool gawk wget bzip2 xz unzip rsync );
headers=( ncurses );
libs=( libstdc++.so.6 );
if syscheck "" "" "${pkgs[*]}" "${headers[*]}" "${libs[*]}";then
echo -e "$r_l""\nCHECK -> You need to manually install the following packages to use this plugin properly:\n"$y_l"$prefix apt install$packages\n""$re_" && _paktc_timer 10;
fi;
};
_check_config(){
nok=0;

2
support/functions/_sys_check
View File

@ -150,7 +150,7 @@ then
[ -f /etc/redhat-release ] && installer="redhat_os"
# Manjaro (/etc/os-release)
[ -f /etc/manjaro-release ] && installer="manjaro_os"
[ -f /etc/manjaro-release ] || [ -f /etc/arch-release ] && installer="manjaro_os"
# SuSE (/etc/SuSE-release is depreciated -> check for YaST2)
[ -d /etc/YaST2 ] && installer="suse_os"

20
support/os/debian_ubuntu.install
View File

@ -18,6 +18,20 @@ do
xz)
inst="xz-utils";
;;
makeinfo)
inst="texinfo";
;;
python3-config)
inst="python3-dev";
;;
libtoolize)
inst="libtool";
;;
libtool)
inst="libtool-bin";
;;
cmp)
inst="diffutils";
esac;
printf -v pad %40s; e=$e$pad; e=${e:0:15};
echo -e "$w_l select $g_l$e$y_l from: $inst";
@ -42,6 +56,9 @@ do
pthread.h)
inst="libc-dev-bin";
;;
ncurses)
inst="libncurses-dev";
;;
esac;
printf -v pad %40s; e=$e$pad; e=${e:0:15};
echo -e "$w_l select $g_l$e$y_l from: $inst";
@ -57,6 +74,9 @@ do
libccidtwin.so)
inst="libccid";
;;
libstdc++.so.6)
inst="libstdc++6";
;;
esac;
printf -v pad %40s; e=$e$pad; e=${e:0:15};
echo -e "$w_l select $g_l$e$y_l from: $inst";

27
support/os/manjaro.install
View File

@ -29,6 +29,21 @@ do
xz)
inst="xz-utils";
;;
scp)
inst="scponly";
;;
makeinfo)
inst="texinfo";
;;
python3-config)
inst="python3-devel";
;;
libtool|libtoolize)
inst="libtool";
;;
cmp)
inst="diffutils";
;;
esac;
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";
@ -52,6 +67,9 @@ do
pthread.h)
inst="libc-dev-bin";
;;
ncurses)
inst="ncurses";
;;
esac;
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";
@ -66,16 +84,19 @@ do
libccidtwin.so)
inst="ccid";
;;
libstdc++.so.6)
inst="gcc-libs";
;;
esac;
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";
fi;
done;
if [ "$(uname -m)" == "x86_64" ] && [ ! -f /usr/lib32/libz.so.1 ]; then
if [ ! -f /usr/lib32/libz.so.1 ]; then
if [ "$(uname -m)" == "x86_64" ] && [ ! -f /usr/lib/libz.so ]; then
if [ ! -f /usr/lib/libz.so ]; then
e="zlib32";
inst="lib32z1";
inst="lib32-zlib";
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";
fi

34
support/os/redhat_centos_fedora.install
View File

@ -26,14 +26,17 @@ case $rh_version in
[6-7])
# Redhat/CentOS 6+7 ok
;;
2[2-3])
# Fedora 22+23 ok
[8])
# Redhat/CentOS 8 ok
installer="dnf";
;;
24)
# Fedora 24 still beta
2?)
# Fedora 20+23 ok
installer="dnf";
;;
3?)
# Fedora 30+ ok
installer="dnf";
echo -e "$r_l This installer is still in the testing stage!";
;;
*)
echo "This version is not supported!" >"$install_log" 2>/dev/null;
@ -67,6 +70,24 @@ do
svn)
inst="subversion";
;;
xz)
inst="xz-utils";
;;
makeinfo)
inst="texinfo";
;;
python3-config)
inst="python3-devel";
;;
libtool|libtoolize)
inst="libtool";
;;
cmp)
inst="diffutils";
;;
g++)
inst="gcc-c++";
;;
# the following guys have no official packages
sshpass)
continue;
@ -101,6 +122,9 @@ do
pthread.h)
inst="glibc-headers";
;;
ncurses)
inst="ncurses-devel";
;;
esac;
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";

24
support/os/suse.install
View File

@ -49,6 +49,24 @@ do
xz)
inst="xz-utils";
;;
makeinfo)
inst="texinfo";
;;
python3-config)
inst="python3-devel";
;;
libtoolize)
inst="libtool";
;;
libtool)
inst="libtool-bin";
;;
cmp)
inst="diffutils";
;;
g++)
inst="gcc-c++";
;;
esac;
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";
@ -72,6 +90,9 @@ do
pthread.h)
inst="glibc-devel";
;;
ncurses)
inst="ncurses-devel";
;;
esac;
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";
@ -86,6 +107,9 @@ do
libccidtwin.so)
inst="pcsc-ccid";
;;
libstdc++.so.6)
inst="libstdc++6";
;;
esac;
echo -e "$w_l select $g_l$e$y_l\tfrom: $inst";
packages="$packages $inst";

Write Preview
Loading…
Cancel
Save