Skip to content

Commit ab8b172

Browse files
abhiTronixabhiTronix
committed
Various Updates
1 parent 8aeaa09 commit ab8b172

File tree

8 files changed

+63
-58
lines changed

8 files changed

+63
-58
lines changed

‎.travis.yml

+39-20
Original file line numberDiff line numberDiff line change
@@ -23,95 +23,114 @@
2323

2424

2525
os: linux
26+
2627
dist: bionic
28+
2729
language: minimal
30+
2831
matrix:
2932
include:
3033
- name: "BASE GCC-8.3.0 32-bit Buster Pi[0-1]"
31-
env: GCC_VERSION=8.3.0 RPIOS_TYPE=buster RPI_TYPE=0-1 BASE=true CACHE_NAME=BASE1
34+
env: GCC_VERSION=8.3.0 RPIOS_TYPE=buster RPI_TYPE=0-1 BASE=true
3235
language: minimal
3336
cache:
3437
ccache: true
3538
directories:
3639
- $HOME/.ccache
40+
3741
- name: "BASE GCC-8.3.0 32-bit Buster Pi[2-3]"
38-
env: GCC_VERSION=8.3.0 RPIOS_TYPE=buster RPI_TYPE=2-3 BASE=true CACHE_NAME=BASE2
42+
env: GCC_VERSION=8.3.0 RPIOS_TYPE=buster RPI_TYPE=2-3 BASE=true
3943
language: minimal
4044
cache:
4145
ccache: true
4246
directories:
4347
- $HOME/.ccache
48+
4449
- name: "BASE GCC-8.3.0 32-bit Buster Pi[3+]"
45-
env: GCC_VERSION=8.3.0 RPIOS_TYPE=buster RPI_TYPE=3+ BASE=true CACHE_NAME=BASE3
50+
env: GCC_VERSION=8.3.0 RPIOS_TYPE=buster RPI_TYPE=3+ BASE=true
4651
language: minimal
4752
cache:
4853
ccache: true
4954
directories:
5055
- $HOME/.ccache
56+
5157
- name: "BASE GCC-6.3.0 32-bit Stretch Pi[0-1]"
52-
env: GCC_VERSION=6.3.0 RPIOS_TYPE=stretch RPI_TYPE=0-1 BASE=true CACHE_NAME=BASE4
58+
env: GCC_VERSION=6.3.0 RPIOS_TYPE=stretch RPI_TYPE=0-1 BASE=true
5359
language: minimal
5460
cache:
5561
ccache: true
5662
directories:
5763
- $HOME/.ccache
64+
5865
- name: "BASE GCC-6.3.0 32-bit Stretch Pi[2-3]"
59-
env: GCC_VERSION=6.3.0 RPIOS_TYPE=stretch RPI_TYPE=2-3 BASE=true CACHE_NAME=BASE5
66+
env: GCC_VERSION=6.3.0 RPIOS_TYPE=stretch RPI_TYPE=2-3 BASE=true
6067
language: minimal
6168
cache:
6269
ccache: true
6370
directories:
6471
- $HOME/.ccache
72+
6573
- name: "BASE GCC-6.3.0 32-bit Stretch Pi[3+]"
66-
env: GCC_VERSION=6.3.0 RPIOS_TYPE=stretch RPI_TYPE=3+ BASE=true CACHE_NAME=BASE6
74+
env: GCC_VERSION=6.3.0 RPIOS_TYPE=stretch RPI_TYPE=3+ BASE=true
6775
language: minimal
6876
cache:
6977
ccache: true
7078
directories:
7179
- $HOME/.ccache
80+
7281
- name: "BASE GCC-8.3.0 64-bit"
73-
env: GCC_VERSION=8.3.0 OS_TYPE=2 RPI_TYPE=64 BASE=true CACHE_NAME=BASE7
82+
env: GCC_VERSION=8.3.0 OS_TYPE=2 RPI_TYPE=64 BASE=true
7483
language: minimal
7584
cache:
7685
ccache: true
7786
directories:
7887
- $HOME/.ccache
88+
7989
- name: "BASE GCC-6.3.0 64-bit"
80-
env: GCC_VERSION=6.3.0 OS_TYPE=1 RPI_TYPE=64 BASE=true CACHE_NAME=BASE8
90+
env: GCC_VERSION=6.3.0 OS_TYPE=1 RPI_TYPE=64 BASE=true
8191
language: minimal
8292
cache:
8393
ccache: true
8494
directories:
8595
- $HOME/.ccache
96+
8697
before_install:
8798
- sudo apt-get update -qq;
88-
sudo apt-get install -qq unzip wget dos2unix -y;
89-
sudo apt-get install -qq build-essential libssh2-1-dev openssl libcurl3 -y;
90-
dos2unix tools/CLIBB_32b;
91-
chmod +x tools/CLIBB_32b;
92-
dos2unix tools/CLIBB_64b;
93-
chmod +x tools/CLIBB_64b;
99+
sudo apt-get install -qq dos2unix -y;
100+
dos2unix build-scripts/CLI/CLIBB_32b;
101+
chmod +x build-scripts/CLI/CLIBB_32b;
102+
dos2unix build-scripts/CLI/CLIBB_64b;
103+
chmod +x build-scripts/CLI/CLIBB_64b;
94104
dos2unix patches/curl_stfp_patcher;
95105
chmod +x patches/curl_stfp_patcher;
96-
dos2unix tools/SF_deployer;
97-
chmod +x tools/SF_deployer;
106+
dos2unix utils/SF_deployer;
107+
chmod +x utils/SF_deployer;
108+
98109
install:
99110
- sudo apt-get -y install -qq gcc g++ gperf flex texinfo ccache pigz gawk gfortran texinfo bison
100-
libncurses-dev autoconf automake;
111+
libncurses-dev autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget;
101112
- sudo /usr/sbin/update-ccache-symlinks;
102113
- echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc;
103114
- source ~/.bashrc && echo $PATH;
115+
104116
script:
105117
- while sleep 60; do echo "=====[ $SECONDS seconds still running ]====="; done &
106-
- if [ "$RPI_TYPE" != "64" ] && [ "$BASE" = "true" ] && [ "$BASE" = "true" ] ; then bash tools/CLIBB_32b -r $RPI_TYPE -o $RPIOS_TYPE; fi
107-
- if [ "$RPI_TYPE" = "64" ] && [ "$BASE" = "true" ] && [ "$BASE" = "true" ] ; then bash tools/CLIBB_64b -g $GCC_VERSION -t $OS_TYPE; fi
118+
- if [ "$RPI_TYPE" != "64" ] && [ "$BASE" = "true" ] ; then bash build-scripts/CLI/CLIBB_32b -r $RPI_TYPE -o $RPIOS_TYPE; fi
119+
- if [ "$RPI_TYPE" = "64" ] && [ "$BASE" = "true" ] ; then bash build-scripts/CLI/CLIBB_64b -g $GCC_VERSION -t $OS_TYPE; fi
108120
- kill %1
121+
109122
after_success:
110123
- bash patches/curl_stfp_patcher;
111-
- bash tools/SF_deployer;
124+
- bash utils/SF_deployer;
125+
112126
branches:
113127
only:
114128
- master
129+
130+
cache:
131+
directories:
132+
- $HOME/.ccache
133+
115134
env:
116135
global:
117136
- CURL_VERSION=7.68.0

‎tools/CLIBB_32b renamed to ‎build-scripts/CLI/CLIBB_32b

File renamed without changes.

‎tools/CLIBB_64b renamed to ‎build-scripts/CLI/CLIBB_64b

File renamed without changes.

‎build-scripts/RTBuilder_32b

+11-11
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,18 @@ helpfunction()
3535
{
3636
#helper function that prints custom usage help menu
3737
echo ""
38+
echo ""
39+
figlet -t -k -f /usr/share/figlet/standard.flf "Raspberry Pi Toolchains Builder 32-bit"
40+
echo ""
41+
figlet -t -k -f /usr/share/figlet/term.flf "Copyright (c) 2020 abhiTronix"
42+
echo ""
43+
echo ""
3844
echo "Usage: $0 -g [GCC version] -r [Target Pi type] -o [Target Pi OS type]"
3945
echo -e "\t-g GCC version you want to compile?: (7.1.0|7.2.0|7.3.0|7.4.0|7.5.0|8.1.0|8.2.0|8.3.0|9.1.0|9.2.0)"
40-
echo -e "\t-r What's yours Raspberry Pi type?: (0-1|2-3|3+)"
41-
echo -e "\t-o What's yours Raspberry Pi OS type?: (stretch|buster)"
46+
echo -e "\t-r What's yours Target Raspberry Pi type?: (0-1|2-3|3+)"
47+
echo -e "\t-o What's yours Target Raspberry Pi OS type?: (stretch|buster)"
48+
echo ""
49+
echo ""
4250
exit 1 # Exit script after printing help
4351
}
4452

@@ -57,7 +65,7 @@ done
5765
#validates parameters and print usage helper function in case parameters are missing
5866
if [ -z "$GCC_VERSION" ] || [ -z "$RPI_TYPE" ] || [ -z "$RPIOS_TYPE" ]
5967
then
60-
echo "Required parameters are missing!";
68+
echo "Error: Required parameters are missing!";
6169
helpfunction
6270
fi
6371

@@ -129,14 +137,6 @@ if [ "$BUILDDIR" = "" ]; then exit 1 ; fi
129137
if [ "$LANGUAGES" = "" ]; then exit 1 ; fi
130138

131139

132-
if [ "$CI" != "true" ]; then
133-
echo ""
134-
echo ""
135-
figlet -t -k -f /usr/share/figlet/standard.flf "Raspberry Pi Toolchains Builder"
136-
echo ""
137-
echo ""
138-
fi
139-
140140
#download binaries if not found
141141
echo "Downloading and Setting up build directories"
142142

‎build-scripts/RTBuilder_64b

+11-12
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,17 @@ helpfunction()
3434
{
3535
#helper function that prints custom usage help menu
3636
echo ""
37-
echo "Usage: $0 -g [GCC version] -t [OS Type]"
37+
echo ""
38+
figlet -t -k -f /usr/share/figlet/standard.flf "Raspberry Pi Toolchains Builder 64-bit"
39+
echo ""
40+
figlet -t -k -f /usr/share/figlet/term.flf "Copyright (c) 2020 abhiTronix"
41+
echo ""
42+
echo ""
43+
echo "Usage: $0 -g [GCC version] -t [Target OS type]"
3844
echo -e "\t-g GCC version you want to compile?: (7.1.0|7.2.0|7.3.0|7.4.0|7.5.0|8.1.0|8.2.0|8.3.0|9.1.0|9.2.0)"
39-
echo -e "\t-t What's yours Raspberry Pi OS type?: (1|2) [default:1]"
45+
echo -e "\t-t What's yours Target OS type?: (1|2) [default:1]"
46+
echo ""
47+
echo ""
4048
exit 1 # Exits script after printing help
4149
}
4250

@@ -53,7 +61,7 @@ do
5361
done
5462
#validates parameters and print usage helper function in case parameters are missing
5563
if [ -z "$GCC_VERSION" ]; then
56-
echo "Required parameter is missing!";
64+
echo "Error: Required parameter is missing!";
5765
helpfunction
5866
elif [ -z "$OS_TYPE" ]; then
5967
OS_TYPE=1
@@ -112,15 +120,6 @@ if [ "$BUILDDIR" = "" ]; then exit 1 ; fi
112120
if [ "$LANGUAGES" = "" ]; then exit 1 ; fi
113121

114122

115-
if [ "$CI" != "true" ]; then
116-
echo ""
117-
echo ""
118-
figlet -t -k -f /usr/share/figlet/standard.flf "Raspberry Pi Toolchains Builder"
119-
echo ""
120-
echo ""
121-
fi
122-
123-
124123
echo "Downloading and Setting up build directories"
125124
#setup paths
126125
DOWNLOADDIR=$BUILDDIR/build_toolchains

‎patches/curl_stfp_patcher

+2-8
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,11 @@
2626

2727
#This script patches curl to enable native sftp support
2828

29-
# echo ""
30-
# echo ""
31-
# figlet -t -k -f /usr/share/figlet/standard.flf "Raspberry Pi Toolchains Patcher"
32-
# echo ""
33-
# echo ""
34-
3529
sudo apt-get purge curl -y;
3630
wget -q https://curl.haxx.se/download/curl-"$CURL_VERSION".tar.gz
3731
tar xf curl-7.68.0.tar.gz
3832
cd curl-7.68.0 || exit
3933
./configure --with-libssh2
40-
make -j8
41-
sudo make install
34+
make -s -j$(getconf _NPROCESSORS_ONLN)
35+
sudo -s make install
4236
sudo ldconfig

‎tools/README.md renamed to ‎utils/README.md

File renamed without changes.

‎tools/SF_deployer renamed to ‎utils/SF_deployer

-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
# This script auto-deploys CLI compiled Cross & Native GCC Toolchain binaries to Sourceforge secured server
2929

3030

31-
# echo ""
32-
# echo ""
33-
# figlet -t -k -f /usr/share/figlet/standard.flf "Raspberry Pi Toolchains Deployer"
34-
# echo ""
35-
# echo ""
36-
37-
3831
#Deploy Cross-compiler Toolchain binaries
3932
if [ -f "$HOME/cross-gcc-$GCC_VERSION-pi_$RPI_TYPE.tar.gz" ]; then
4033
if [ "$RPI_TYPE" = "64" ]; then

0 commit comments

Comments
 (0)