Skip to content

Commit

Permalink
Script: Fixed bugs
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
abhiTronix committed Oct 11, 2021
1 parent 7ca9093 commit 927292e
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 35 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/builder_0_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ on:
release:
branches:
- master
types: [published]
paths-ignore:
- '**.md'

Expand Down Expand Up @@ -78,7 +79,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -125,7 +126,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -172,7 +173,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/builder_2_3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ on:
release:
branches:
- master
types: [published]
paths-ignore:
- '**.md'

Expand Down Expand Up @@ -76,7 +77,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -123,7 +124,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -168,7 +169,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/builder_3_plus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ on:
release:
branches:
- master
types: [published]
paths-ignore:
- '**.md'

Expand Down Expand Up @@ -76,7 +77,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -121,7 +122,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -168,7 +169,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/builder_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ on:
release:
branches:
- master
types: [published]
paths-ignore:
- '**.md'

Expand Down Expand Up @@ -80,7 +81,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -127,7 +128,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -174,7 +175,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/builder_x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ on:
release:
branches:
- master
types: [published]
paths-ignore:
- '**.md'

Expand Down Expand Up @@ -76,7 +77,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down Expand Up @@ -120,7 +121,7 @@ jobs:
if: success()
- name: install
run: |
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
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
sudo /usr/sbin/update-ccache-symlinks
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
source ~/.bashrc && echo $PATH
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
* ☑️ *Exclusive **ARM64|AARCH64** Binaries for Raspberry Pi 64-Bit kernel OS flavors.*
* ☑️ *Open-sourced Toolchains build-scripts are also available.*
* ☑️ *[**Comprehensive Guide**](QT_build_instructions.md) for Cross-compile Latest QT for any Raspberry Pi variant/model available*
* ☑️ *Latest [**GDB Debugger v9.2**](https://www.gnu.org/software/gdb/download/ANNOUNCEMENT) included in all binaries.*
* ☑️ *Latest [**GDB Debugger v10.2**](https://www.gnu.org/software/gdb/download/ANNOUNCEMENT) included in all binaries.*


&nbsp;
Expand Down
5 changes: 1 addition & 4 deletions build-scripts/CI/CIBB_32b
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,7 @@ mkdir -p "$INSTALLDIR"
cd "$DOWNLOADDIR" || exit

if [ ! -d "linux" ]; then
wget https://github.com/$(wget https://github.com/raspberrypi/linux/releases/latest -O - | grep -E '/.*/.*/.*.tar.gz' -o)
tar xf raspberrypi*.tar.gz
mv linux* linux
rm ./*.tar.*
git clone --depth=1 https://github.com/raspberrypi/linux
fi
if [ ! -d "gcc-$GCC_VERSION" ]; then
if [ ! -f "gcc-$GCC_VERSION.tar.gz" ]; then
Expand Down
9 changes: 3 additions & 6 deletions build-scripts/CI/CIBB_64b
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fi

#pre-defined params
FOLDER_VERSION=64
KERNEL=kernel7
KERNEL=kernel8
ARCH=armv8-a+fp+simd
TARGET=aarch64-linux-gnu
GDB_VERSION=10.2
Expand All @@ -102,7 +102,7 @@ GDB_VERSION=10.2
if ! [[ "$GCC_VERSION" =~ ^(6.3.0|8.3.0)$ ]]; then exit 1; fi
if ! [[ "$GLIBC_VERSION" =~ ^(2.24|2.28)$ ]]; then exit 1; fi
if ! [[ "$BINUTILS_VERSION" =~ ^(2.28|2.31.1)$ ]]; then exit 1; fi
if [ "$KERNEL" != "kernel7" ]; then exit 1; fi
if [ "$KERNEL" != "kernel8" ]; then exit 1; fi
if [ "$ARCH" != "armv8-a+fp+simd" ]; then exit 1; fi
if [ "$FOLDER_VERSION" != "64" ]; then exit 1; fi
if [ "$BUILDDIR" = "" ]; then exit 1; fi
Expand All @@ -121,10 +121,7 @@ mkdir -p "$INSTALLDIR"
cd "$DOWNLOADDIR" || exit
#download binaries if not found
if [ ! -d "linux" ]; then
wget https://github.com/$(wget https://github.com/raspberrypi/linux/releases/latest -O - | egrep '/.*/.*/.*.tar.gz' -o)
tar xf raspberrypi*.tar.gz
mv linux* linux
rm ./*.tar.*
git clone --depth=1 https://github.com/raspberrypi/linux
fi
if [ ! -d "gcc-$GCC_VERSION" ]; then
if [ ! -f "gcc-$GCC_VERSION.tar.gz" ]; then
Expand Down
5 changes: 1 addition & 4 deletions build-scripts/RTBuilder_32b
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,7 @@ mkdir -p "$INSTALLDIR"
cd "$DOWNLOADDIR" || exit

if [ ! -d "linux" ]; then
wget -q https://github.com/$(wget -q https://github.com/raspberrypi/linux/releases/latest -O - | grep -E '/.*/.*/.*.tar.gz' -o | head -n1)
tar xf raspberrypi*.tar.gz
mv linux* linux
rm ./*.tar.*
git clone --depth=1 https://github.com/raspberrypi/linux
fi
if [ ! -d "gcc-$GCCBASE_VERSION" ]; then
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
Expand Down
9 changes: 3 additions & 6 deletions build-scripts/RTBuilder_64b
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fi

#pre-defined params
FOLDER_VERSION=64
KERNEL=kernel7
KERNEL=kernel8
ARCH=armv8-a+fp+simd
TARGET=aarch64-linux-gnu
GDB_VERSION=10.2
Expand All @@ -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.
if ! [[ "$GCCBASE_VERSION" =~ ^(6.3.0|8.3.0)$ ]]; then exit 1; fi
if ! [[ "$GLIBC_VERSION" =~ ^(2.24|2.28)$ ]]; then exit 1; fi
if ! [[ "$BINUTILS_VERSION" =~ ^(2.28|2.31.1)$ ]]; then exit 1; fi
if [ "$KERNEL" != "kernel7" ]; then exit 1; fi
if [ "$KERNEL" != "kernel8" ]; then exit 1; fi
if [ "$ARCH" != "armv8-a+fp+simd" ]; then exit 1; fi
if [ "$FOLDER_VERSION" != "64" ]; then exit 1; fi
if [ "$BUILDDIR" = "" ]; then exit 1; fi
Expand All @@ -136,10 +136,7 @@ mkdir -p "$INSTALLDIR"
cd "$DOWNLOADDIR" || exit
#download binaries if not found
if [ ! -d "linux" ]; then
wget -q https://github.com/$(wget -q https://github.com/raspberrypi/linux/releases/latest -O - | egrep '/.*/.*/.*.tar.gz' -o | head -n1)
tar xf raspberrypi*.tar.gz
mv linux* linux
rm ./*.tar.*
git clone --depth=1 https://github.com/raspberrypi/linux
fi
if [ ! -d "gcc-$GCCBASE_VERSION" ]; then
if [ ! -f "gcc-$GCCBASE_VERSION.tar.gz" ]; then
Expand Down

0 comments on commit 927292e

Please sign in to comment.