From 2f83cef278660b440f409adca0cf8fc4a66e0c89 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:59:21 +0100
Subject: [PATCH] checkout correct branch

---
 build_headers.sh        | 38 +++++++++++++++++++-------------------
 kernels/pi-bullseye-v6  |  4 ++--
 kernels/pi-bullseye-v7  |  2 +-
 kernels/pi-bullseye-v7l |  2 +-
 scripts/common.sh       |  8 ++++----
 scripts/platform.sh     |  5 ++++-
 6 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/build_headers.sh b/build_headers.sh
index 8573bbc..3f4da7c 100644
--- a/build_headers.sh
+++ b/build_headers.sh
@@ -255,23 +255,23 @@ if [[ "${PLATFORM}" == "pi" ]]; then
     build_pi_kernel
 	echo "Copy kernel7"
 	pushd ${LINUX_DIR}
-	sudo mkdir -p /usr/src/6.1.73-common
-	sudo mkdir -p /usr/src/6.1.73-rpi
-	sudo mkdir -p ${PACKAGE_DIR}/lib/modules/6.1.73-v7+/
-	sudo ln -s /usr/src/6.1.73-common/ ${PACKAGE_DIR}/lib/modules/6.1.73-v7+/source
-	sudo ln -s /usr/src/6.1.73-rpi ${PACKAGE_DIR}/lib/modules/6.1.73-v7+/build
-	sudo mkdir -p ${PACKAGE_DIR}/usr/src/6.1.73-rpi/include
-	sudo mkdir -p ${PACKAGE_DIR}/usr/src/6.1.73-rpi/arch/arm
+	sudo mkdir -p /usr/src/6.1.29-common
+	sudo mkdir -p /usr/src/6.1.29-rpi
+	sudo mkdir -p ${PACKAGE_DIR}/lib/modules/6.1.29-v7+/
+	sudo ln -s /usr/src/6.1.29-common/ ${PACKAGE_DIR}/lib/modules/6.1.29-v7+/source
+	sudo ln -s /usr/src/6.1.29-rpi ${PACKAGE_DIR}/lib/modules/6.1.29-v7+/build
+	sudo mkdir -p ${PACKAGE_DIR}/usr/src/6.1.29-rpi/include
+	sudo mkdir -p ${PACKAGE_DIR}/usr/src/6.1.29-rpi/arch/arm
 	echo "$pwd"
-	sudo cp -r include/generated ${PACKAGE_DIR}/usr/src/6.1.73-rpi/include
-	sudo cp -r include/config ${PACKAGE_DIR}/usr/src/6.1.73-rpi/include
-	sudo cp -r arch/arm ${PACKAGE_DIR}/usr/src/6.1.73-rpi/arch/
-	sudo cp -r tools ${PACKAGE_DIR}/usr/src/6.1.73-rpi/
-	sudo cp -r scripts ${PACKAGE_DIR}/usr/src/6.1.73-rpi/
-	sudo cp -r Module.symvers ${PACKAGE_DIR}/usr/src/6.1.73-rpi/
-	sudo cp -r Makefile ${PACKAGE_DIR}/usr/src/6.1.73-rpi/
-	sudo cp -r .kernelvariables ${PACKAGE_DIR}/usr/src/6.1.73-rpi/
-	sudo cp -r .config ${PACKAGE_DIR}/usr/src/6.1.73-rpi/
+	sudo cp -r include/generated ${PACKAGE_DIR}/usr/src/6.1.29-rpi/include
+	sudo cp -r include/config ${PACKAGE_DIR}/usr/src/6.1.29-rpi/include
+	sudo cp -r arch/arm ${PACKAGE_DIR}/usr/src/6.1.29-rpi/arch/
+	sudo cp -r tools ${PACKAGE_DIR}/usr/src/6.1.29-rpi/
+	sudo cp -r scripts ${PACKAGE_DIR}/usr/src/6.1.29-rpi/
+	sudo cp -r Module.symvers ${PACKAGE_DIR}/usr/src/6.1.29-rpi/
+	sudo cp -r Makefile ${PACKAGE_DIR}/usr/src/6.1.29-rpi/
+	sudo cp -r .kernelvariables ${PACKAGE_DIR}/usr/src/6.1.29-rpi/
+	sudo cp -r .config ${PACKAGE_DIR}/usr/src/6.1.29-rpi/
 	sudo rm -Rf ${PACKAGE_DIR}/etc
 	sudo rm -Rf ${PACKAGE_DIR}/boot
 	sudo rm -Rf ${PACKAGE_DIR}/lib/firmware
@@ -284,9 +284,9 @@ if [[ "${PLATFORM}" == "pi" ]]; then
     build_pi_kernel
 	echo "Copy kernel7l"
 	pushd ${LINUX_DIR}
-	sudo mkdir -p ${PACKAGE_DIR}/lib/modules/6.1.73-v7l+/
-	sudo ln -s /usr/src/6.1.73-common/ ${PACKAGE_DIR}/lib/modules/6.1.73-v7l+/source
-	sudo ln -s /usr/src/6.1.73-rpi ${PACKAGE_DIR}/lib/modules/6.1.73-v7l+/build
+	sudo mkdir -p ${PACKAGE_DIR}/lib/modules/6.1.29-v7l+/
+	sudo ln -s /usr/src/6.1.29-common/ ${PACKAGE_DIR}/lib/modules/6.1.29-v7l+/source
+	sudo ln -s /usr/src/6.1.29-rpi ${PACKAGE_DIR}/lib/modules/6.1.29-v7l+/build
 	sudo ls -a
 
 fi
diff --git a/kernels/pi-bullseye-v6 b/kernels/pi-bullseye-v6
index 1fe6358..eed0b68 100644
--- a/kernels/pi-bullseye-v6
+++ b/kernels/pi-bullseye-v6
@@ -1,5 +1,5 @@
 KERNEL=kernel
-KERNEL_BRANCH="rpi-6.1.y"
-KERNEL_VERSION="6.1.73+"
+KERNEL_BRANCH="rpi-6.1-stable"
+KERNEL_VERSION="6.1.29+"
 KERNEL_COMMIT="20cb6d7b533b5e6d7df8a2cb7a83bd4555834bde"
 ISA=v6
diff --git a/kernels/pi-bullseye-v7 b/kernels/pi-bullseye-v7
index 59456ee..de286d6 100644
--- a/kernels/pi-bullseye-v7
+++ b/kernels/pi-bullseye-v7
@@ -1,5 +1,5 @@
 KERNEL=kernel7
 KERNEL_BRANCH="rpi-6.1.y"
-KERNEL_VERSION="6.1.73-v7+"
+KERNEL_VERSION="6.1.29-v7+"
 KERNEL_COMMIT="20cb6d7b533b5e6d7df8a2cb7a83bd4555834bde"
 ISA=v7
diff --git a/kernels/pi-bullseye-v7l b/kernels/pi-bullseye-v7l
index 336679f..d4b58bd 100644
--- a/kernels/pi-bullseye-v7l
+++ b/kernels/pi-bullseye-v7l
@@ -1,5 +1,5 @@
 KERNEL=kernel7l
 KERNEL_BRANCH="rpi-6.1.y"
-KERNEL_VERSION="6.1.73-v7l+"
+KERNEL_VERSION="6.1.29-v7l+"
 KERNEL_COMMIT="20cb6d7b533b5e6d7df8a2cb7a83bd4555834bde"
 ISA=v7l
diff --git a/scripts/common.sh b/scripts/common.sh
index eb5ca1c..c0b3389 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -30,10 +30,10 @@ function package() {
     rm ${PACKAGE_NAME}_${VERSION}_${PACKAGE_ARCH}.deb >/dev/null 2>&1
     if [[ "${PLATFORM}" == "pi" ]]; then
         cd ${SRC_DIR}
-        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.73-v7+/source
-        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.73-v7+/build
-        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.73-v7l+/source
-        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.73-v7l+/build
+        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.29-v7+/source
+        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.29-v7+/build
+        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.29-v7l+/source
+        rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.29-v7l+/build
         fpm -a ${PACKAGE_ARCH} -s dir -t deb -n ${PACKAGE_NAME} -v ${VERSION} -C ${PACKAGE_DIR} \
             --after-install after-install.sh \
             --before-install before-install.sh \
diff --git a/scripts/platform.sh b/scripts/platform.sh
index 1366ebe..9f7ada1 100644
--- a/scripts/platform.sh
+++ b/scripts/platform.sh
@@ -70,7 +70,10 @@ function fetch_SBC_source() {
 			echo "Download the kernel source"
 			echo "------------------------------"
 			# Use --depth 1 to save some space on unneccessary huge git log
-			git clone ${KERNEL_REPO} ${LINUX_DIR} -b ${KERNEL_BRANCH} --depth 1 || exit 1
+			git clone ${KERNEL_REPO} ${LINUX_DIR} -b ${KERNEL_BRANCH} --depth=1 || exit 1
+			echo "_________________GIT_____________________________"
+			git status
+			echo "__________________GIT_END____________________"
 			popd
 		fi