Skip to content

Commit 927292e

Browse files
abhiTronixabhiTronix
committed
Script: Fixed bugs
- Replaced linux kernel tar release download and extraction with `git clone`. - Updated Kernel config to `kernel8` in 64-bit toolchains. - Restricted release type to `publish` only. - Added `git` dependency in CI. - Fixed minor typo.
1 parent 7ca9093 commit 927292e

10 files changed

+28
-35
lines changed

‎.github/workflows/builder_0_1.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ on:
3939
release:
4040
branches:
4141
- master
42+
types: [published]
4243
paths-ignore:
4344
- '**.md'
4445

@@ -78,7 +79,7 @@ jobs:
7879
if: success()
7980
- name: install
8081
run: |
81-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
82+
sudo apt-get -y install -qq gcc g++ gperf git flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
8283
sudo /usr/sbin/update-ccache-symlinks
8384
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
8485
source ~/.bashrc && echo $PATH
@@ -125,7 +126,7 @@ jobs:
125126
if: success()
126127
- name: install
127128
run: |
128-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
129+
sudo apt-get -y install -qq gcc g++ gperf flex texinfo git pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
129130
sudo /usr/sbin/update-ccache-symlinks
130131
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
131132
source ~/.bashrc && echo $PATH
@@ -172,7 +173,7 @@ jobs:
172173
if: success()
173174
- name: install
174175
run: |
175-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
176+
sudo apt-get -y install -qq gcc g++ gperf flex git texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
176177
sudo /usr/sbin/update-ccache-symlinks
177178
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
178179
source ~/.bashrc && echo $PATH

‎.github/workflows/builder_2_3.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ on:
3939
release:
4040
branches:
4141
- master
42+
types: [published]
4243
paths-ignore:
4344
- '**.md'
4445

@@ -76,7 +77,7 @@ jobs:
7677
if: success()
7778
- name: install
7879
run: |
79-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
80+
sudo apt-get -y install -qq gcc g++ gperf git flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
8081
sudo /usr/sbin/update-ccache-symlinks
8182
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
8283
source ~/.bashrc && echo $PATH
@@ -123,7 +124,7 @@ jobs:
123124
if: success()
124125
- name: install
125126
run: |
126-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
127+
sudo apt-get -y install -qq gcc g++ gperf flex git texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
127128
sudo /usr/sbin/update-ccache-symlinks
128129
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
129130
source ~/.bashrc && echo $PATH
@@ -168,7 +169,7 @@ jobs:
168169
if: success()
169170
- name: install
170171
run: |
171-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
172+
sudo apt-get -y install -qq gcc g++ gperf flex git texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
172173
sudo /usr/sbin/update-ccache-symlinks
173174
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
174175
source ~/.bashrc && echo $PATH

‎.github/workflows/builder_3_plus.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ on:
3939
release:
4040
branches:
4141
- master
42+
types: [published]
4243
paths-ignore:
4344
- '**.md'
4445

@@ -76,7 +77,7 @@ jobs:
7677
if: success()
7778
- name: install
7879
run: |
79-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
80+
sudo apt-get -y install -qq gcc g++ gperf flex git texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
8081
sudo /usr/sbin/update-ccache-symlinks
8182
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
8283
source ~/.bashrc && echo $PATH
@@ -121,7 +122,7 @@ jobs:
121122
if: success()
122123
- name: install
123124
run: |
124-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
125+
sudo apt-get -y install -qq gcc g++ gperf flex texinfo git pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
125126
sudo /usr/sbin/update-ccache-symlinks
126127
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
127128
source ~/.bashrc && echo $PATH
@@ -168,7 +169,7 @@ jobs:
168169
if: success()
169170
- name: install
170171
run: |
171-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
172+
sudo apt-get -y install -qq gcc g++ gperf flex texinfo git pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
172173
sudo /usr/sbin/update-ccache-symlinks
173174
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
174175
source ~/.bashrc && echo $PATH

‎.github/workflows/builder_64.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ on:
3939
release:
4040
branches:
4141
- master
42+
types: [published]
4243
paths-ignore:
4344
- '**.md'
4445

@@ -80,7 +81,7 @@ jobs:
8081
if: success()
8182
- name: install
8283
run: |
83-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
84+
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk git gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
8485
sudo /usr/sbin/update-ccache-symlinks
8586
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
8687
source ~/.bashrc && echo $PATH
@@ -127,7 +128,7 @@ jobs:
127128
if: success()
128129
- name: install
129130
run: |
130-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
131+
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk git gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
131132
sudo /usr/sbin/update-ccache-symlinks
132133
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
133134
source ~/.bashrc && echo $PATH
@@ -174,7 +175,7 @@ jobs:
174175
if: success()
175176
- name: install
176177
run: |
177-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
178+
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk git gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
178179
sudo /usr/sbin/update-ccache-symlinks
179180
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
180181
source ~/.bashrc && echo $PATH

‎.github/workflows/builder_x86_64.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ on:
3939
release:
4040
branches:
4141
- master
42+
types: [published]
4243
paths-ignore:
4344
- '**.md'
4445

@@ -76,7 +77,7 @@ jobs:
7677
if: success()
7778
- name: install
7879
run: |
79-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
80+
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz git gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
8081
sudo /usr/sbin/update-ccache-symlinks
8182
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
8283
source ~/.bashrc && echo $PATH
@@ -120,7 +121,7 @@ jobs:
120121
if: success()
121122
- name: install
122123
run: |
123-
sudo apt-get -y install -qq gcc g++ gperf gcc-multilib g++-multilib libc6-i386 libc6-dev-i386 flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
124+
sudo apt-get -y install -qq gcc g++ gperf git gcc-multilib g++-multilib libc6-i386 libc6-dev-i386 flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget figlet
124125
sudo /usr/sbin/update-ccache-symlinks
125126
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
126127
source ~/.bashrc && echo $PATH

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
9797
* ☑️ *Exclusive **ARM64|AARCH64** Binaries for Raspberry Pi 64-Bit kernel OS flavors.*
9898
* ☑️ *Open-sourced Toolchains build-scripts are also available.*
9999
* ☑️ *[**Comprehensive Guide**](QT_build_instructions.md) for Cross-compile Latest QT for any Raspberry Pi variant/model available*
100-
* ☑️ *Latest [**GDB Debugger v9.2**](https://www.gnu.org/software/gdb/download/ANNOUNCEMENT) included in all binaries.*
100+
* ☑️ *Latest [**GDB Debugger v10.2**](https://www.gnu.org/software/gdb/download/ANNOUNCEMENT) included in all binaries.*
101101

102102

103103
&nbsp;

‎build-scripts/CI/CIBB_32b

+1-4
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,7 @@ mkdir -p "$INSTALLDIR"
132132
cd "$DOWNLOADDIR" || exit
133133

134134
if [ ! -d "linux" ]; then
135-
wget https://github.com/$(wget https://github.com/raspberrypi/linux/releases/latest -O - | grep -E '/.*/.*/.*.tar.gz' -o)
136-
tar xf raspberrypi*.tar.gz
137-
mv linux* linux
138-
rm ./*.tar.*
135+
git clone --depth=1 https://github.com/raspberrypi/linux
139136
fi
140137
if [ ! -d "gcc-$GCC_VERSION" ]; then
141138
if [ ! -f "gcc-$GCC_VERSION.tar.gz" ]; then

‎build-scripts/CI/CIBB_64b

+3-6
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ fi
9393

9494
#pre-defined params
9595
FOLDER_VERSION=64
96-
KERNEL=kernel7
96+
KERNEL=kernel8
9797
ARCH=armv8-a+fp+simd
9898
TARGET=aarch64-linux-gnu
9999
GDB_VERSION=10.2
@@ -102,7 +102,7 @@ GDB_VERSION=10.2
102102
if ! [[ "$GCC_VERSION" =~ ^(6.3.0|8.3.0)$ ]]; then exit 1; fi
103103
if ! [[ "$GLIBC_VERSION" =~ ^(2.24|2.28)$ ]]; then exit 1; fi
104104
if ! [[ "$BINUTILS_VERSION" =~ ^(2.28|2.31.1)$ ]]; then exit 1; fi
105-
if [ "$KERNEL" != "kernel7" ]; then exit 1; fi
105+
if [ "$KERNEL" != "kernel8" ]; then exit 1; fi
106106
if [ "$ARCH" != "armv8-a+fp+simd" ]; then exit 1; fi
107107
if [ "$FOLDER_VERSION" != "64" ]; then exit 1; fi
108108
if [ "$BUILDDIR" = "" ]; then exit 1; fi
@@ -121,10 +121,7 @@ mkdir -p "$INSTALLDIR"
121121
cd "$DOWNLOADDIR" || exit
122122
#download binaries if not found
123123
if [ ! -d "linux" ]; then
124-
wget https://github.com/$(wget https://github.com/raspberrypi/linux/releases/latest -O - | egrep '/.*/.*/.*.tar.gz' -o)
125-
tar xf raspberrypi*.tar.gz
126-
mv linux* linux
127-
rm ./*.tar.*
124+
git clone --depth=1 https://github.com/raspberrypi/linux
128125
fi
129126
if [ ! -d "gcc-$GCC_VERSION" ]; then
130127
if [ ! -f "gcc-$GCC_VERSION.tar.gz" ]; then

‎build-scripts/RTBuilder_32b

+1-4
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,7 @@ mkdir -p "$INSTALLDIR"
157157
cd "$DOWNLOADDIR" || exit
158158

159159
if [ ! -d "linux" ]; then
160-
wget -q https://github.com/$(wget -q https://github.com/raspberrypi/linux/releases/latest -O - | grep -E '/.*/.*/.*.tar.gz' -o | head -n1)
161-
tar xf raspberrypi*.tar.gz
162-
mv linux* linux
163-
rm ./*.tar.*
160+
git clone --depth=1 https://github.com/raspberrypi/linux
164161
fi
165162
if [ ! -d "gcc-$GCCBASE_VERSION" ]; then
166163
if [ ! -f "gcc-$GCCBASE_VERSION.tar.gz" ]; then wget -q --no-check-certificate https://ftp.gnu.org/gnu/gcc/gcc-$GCCBASE_VERSION/gcc-$GCCBASE_VERSION.tar.gz; fi

‎build-scripts/RTBuilder_64b

+3-6
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fi
107107

108108
#pre-defined params
109109
FOLDER_VERSION=64
110-
KERNEL=kernel7
110+
KERNEL=kernel8
111111
ARCH=armv8-a+fp+simd
112112
TARGET=aarch64-linux-gnu
113113
GDB_VERSION=10.2
@@ -117,7 +117,7 @@ if ! [[ "$GCC_VERSION" =~ ^(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.
117117
if ! [[ "$GCCBASE_VERSION" =~ ^(6.3.0|8.3.0)$ ]]; then exit 1; fi
118118
if ! [[ "$GLIBC_VERSION" =~ ^(2.24|2.28)$ ]]; then exit 1; fi
119119
if ! [[ "$BINUTILS_VERSION" =~ ^(2.28|2.31.1)$ ]]; then exit 1; fi
120-
if [ "$KERNEL" != "kernel7" ]; then exit 1; fi
120+
if [ "$KERNEL" != "kernel8" ]; then exit 1; fi
121121
if [ "$ARCH" != "armv8-a+fp+simd" ]; then exit 1; fi
122122
if [ "$FOLDER_VERSION" != "64" ]; then exit 1; fi
123123
if [ "$BUILDDIR" = "" ]; then exit 1; fi
@@ -136,10 +136,7 @@ mkdir -p "$INSTALLDIR"
136136
cd "$DOWNLOADDIR" || exit
137137
#download binaries if not found
138138
if [ ! -d "linux" ]; then
139-
wget -q https://github.com/$(wget -q https://github.com/raspberrypi/linux/releases/latest -O - | egrep '/.*/.*/.*.tar.gz' -o | head -n1)
140-
tar xf raspberrypi*.tar.gz
141-
mv linux* linux
142-
rm ./*.tar.*
139+
git clone --depth=1 https://github.com/raspberrypi/linux
143140
fi
144141
if [ ! -d "gcc-$GCCBASE_VERSION" ]; then
145142
if [ ! -f "gcc-$GCCBASE_VERSION.tar.gz" ]; then

0 commit comments

Comments
 (0)