Build-Script: Critical Bug Fixes (Fixes #61)

- Extended build-script sysroot patch to `RTBuilder_32b`.
- Replaced incorrect `RPI_TYPE` with `FOLDER_VERSION`.
- Replaced `OS_TYPE` with `RPIOS_TYPE` in `RTBuilder_64b.
- Added Buster and Stretch native support for `RTBuilder_64b` build script.

Author: abhiTronix

build-scripts/RTBuilder_32b

@@ -215,7 +215,7 @@ mkdir -p "$SYSROOTDIR"/usr/lib
 echo "Building binutils..."
 if [ -n "$(ls -A "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build/*; fi
 cd "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build || exit
-../configure --target=$TARGET --prefix= --with-arch=$ARCH --with-fpu=$FPU --with-float=hard --disable-multilib
+../configure --target=$TARGET --prefix= --with-arch=$ARCH --with-sysroot=/$TARGET/libc --with-build-sysroot="$SYSROOTDIR" --with-fpu=$FPU --with-float=hard --disable-multilib
 make -s -j$(nproc)
 make -s install DESTDIR="$INSTALLDIR"
 if [ -n "$(ls -A "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build/*; fi
@@ -228,7 +228,7 @@ make -s -j$(nproc) all-gcc
 make -s install-gcc DESTDIR="$INSTALLDIR"
 if [ -n "$(ls -A "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build/*; fi
 cd "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build || exit
-../configure --prefix=/usr --build="$MACHTYPE" --host=$TARGET --target=$TARGET --with-arch=$ARCH --with-fpu=$FPU --with-float=hard --with-headers="$SYSROOTDIR"/usr/include --with-lib="$SYSROOTDIR"/usr/lib --disable-multilib libc_cv_forced_unwind=yes
+../configure --prefix=/usr --build="$MACHTYPE" --host=$TARGET --target=$TARGET --with-arch=$ARCH --with-sysroot=/$TARGET/libc --with-build-sysroot="$SYSROOTDIR" --with-fpu=$FPU --with-float=hard --with-headers="$SYSROOTDIR"/usr/include --with-lib="$SYSROOTDIR"/usr/lib --disable-multilib libc_cv_forced_unwind=yes
 make -s install-bootstrap-headers=yes install-headers DESTDIR="$SYSROOTDIR"
 make -s -j$(nproc) csu/subdir_lib
 install csu/crt1.o csu/crti.o csu/crtn.o "$SYSROOTDIR"/usr/lib

build-scripts/RTBuilder_64b

@@ -33,43 +33,49 @@ helpfunction() {
 	figlet -t -k -f /usr/share/figlet/term.flf "Copyright (c) 2020 abhiTronix"
 	echo ""
 	echo ""
-	echo "Usage: $0 -g [GCC version] -t [Target OS type]"
+	echo "Usage: $0 -g [GCC version] -o [Target Pi OS type]"
 	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|9.3.0|10.1.0|10.2.0)"
-	echo -e "\t-t What's yours Target OS type?: (1|2) [default:1]"
+	echo -e "\t-o What's yours Target Raspberry Pi OS type?: (stretch|buster)"
 	echo ""
 	echo ""
 	exit 1 # Exits script after printing help
 }
 
 #input arguments handler
-while getopts "g:t:" opt; do
+while getopts "g:o:" opt; do
 	case "$opt" in
 	g) GCC_VERSION="$OPTARG" ;;
-	t) OS_TYPE="$OPTARG" ;;
+	o) RPIOS_TYPE="$OPTARG" ;;
 	?) helpfunction ;; #prints help function for invalid parameter
 	esac
 done
 #validates parameters and print usage helper function in case parameters are missing
-if [ -z "$GCC_VERSION" ]; then
-	echo "Error: Required parameter is missing!"
+if [ -z "$GCC_VERSION" ] || [ -z "$RPIOS_TYPE" ]; then
+	echo "Error: Required parameters are missing!"
 	helpfunction
-elif [ -z "$OS_TYPE" ]; then
-	OS_TYPE=1
-else
-	echo "Parameters configured!"
 fi
 
 #collect dependencies versions from raspberry pi os
-if [ "$OS_TYPE" = "1" ] || echo ${GCC_VERSION%.*} "8.3" | awk '{exit ( $1 >= $2 )}'; then
-	GCCBASE_VERSION=6.3.0
+if [ "$RPIOS_TYPE" = "stretch" ]; then
+	if echo ${GCC_VERSION%.*} "6.3" | awk '{exit ( $1 >= $2 )}'; then
+		echo "$GCC_VERSION is not supported on stretch!"
+		exit 0
+	else
+		GCCBASE_VERSION=6.3.0
+	fi
 	GLIBC_VERSION=2.24
 	BINUTILS_VERSION=2.28
-elif [ "$OS_TYPE" = "2" ]; then
-	GCCBASE_VERSION=8.3.0
+elif [ "$RPIOS_TYPE" = "buster" ]; then
+	if echo ${GCC_VERSION%.*} "8.3" | awk '{exit ( $1 >= $2 )}'; then
+		echo "$GCC_VERSION is not supported on buster!"
+		exit 0
+	else
+		GCCBASE_VERSION=8.3.0
+	fi
 	GLIBC_VERSION=2.28
 	BINUTILS_VERSION=2.31
 else
-	echo "Invalid argument value: $OS_TYPE"
+	echo "Invalid argument value: $RPIOS_TYPE"
 	exit
 fi
 
@@ -260,7 +266,7 @@ if [ "$GCC_VERSION" != "$GCCBASE_VERSION" ]; then
 	mv "$BUILDDIR"/native-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION "$HOME"
 	cd "$HOME" || exit
 	#compress with maximum possible compression level.
-	tar cf - native-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION | pigz -9 -p 32 >native-gcc-"$GCC_VERSION"-pi_"$RPI_TYPE".tar.gz
+	tar cf - native-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION | pigz -9 -p 32 >native-gcc-"$GCC_VERSION"-pi_"$FOLDER_VERSION".tar.gz
 	rm -rf "$HOME"/native-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION
 	echo "Done Building Native GCC $GCC_VERSION Binaries..."
 fi
@@ -280,7 +286,7 @@ echo "Done Building Cross GDB Binaries..."
 mv "$BUILDDIR"/cross-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION "$HOME"
 cd "$HOME" || exit
 #compress with maximum possible compression level.
-tar cf - cross-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION | pigz -9 >cross-gcc-"$GCC_VERSION"-pi_"$RPI_TYPE".tar.gz
+tar cf - cross-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION | pigz -9 >cross-gcc-"$GCC_VERSION"-pi_"$FOLDER_VERSION".tar.gz
 echo "Done Building Cross GCC $GCC_VERSION Binaries..."
 rm -rf "$HOME"/cross-pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION