From 49d3e84ce34b2f491fdf6a2b58143180e2218f5f Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sat, 21 Oct 2023 23:01:51 +0200
Subject: [PATCH] v8.23

- Quartz64 | Update kernel to v6.5.8
---
 .update/patches | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/.update/patches b/.update/patches
index 42d7fa1e35..244b0693b7 100755
--- a/.update/patches
+++ b/.update/patches
@@ -1418,24 +1418,43 @@ Patch_8_22()
 SUBSYSTEM=="leds", KERNEL=="green:lan", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth0", RUN+="/bin/ip l s down dev eth0"
 SUBSYSTEM=="leds", KERNEL=="green:wan", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth1", RUN+="/bin/ip l s down dev eth1"
 _EOF_
+
+	# Orange Pi 5: Fix fdtfile entry
+	elif (( $G_HW_MODEL == 80 )) && grep -q '^fdtfile=$' /boot/dietpiEnv.txt
+	then
+		G_DIETPI-NOTIFY 2 'Fixing fdtfile entry in dietpiEnv.txt ...'
+		G_EXEC sed -i '/^fdtfile=$/d' /boot/dietpiEnv.txt
+	fi
+}
+
+Patch_8_23()
+{
+	# RPi: Update raspberrypi-sys-mods: https://github.com/MichaIng/DietPi/issues/6666
+	if (( $G_HW_MODEL < 10 )) && dpkg --compare-versions "$(dpkg-query -Wf '${Version}' raspberrypi-sys-mods 2> /dev/null)" lt-nl 2:20230510-dietpi2
+	then
+		G_DIETPI-NOTIFY 2 'Updating raspberrypi-sys-mods package ...'
+		G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb 'https://dietpi.com/downloads/binaries/raspberrypi-sys-mods.deb'
+		G_EXEC_OUTPUT=1 G_EXEC dpkg -i --force-confdef,confold package.deb
+		G_EXEC rm package.deb
+
 	# Quartz64
 	elif (( $G_HW_MODEL == 49 ))
 	then
-		if dpkg --compare-versions "$(dpkg-query -Wf '${Version}' firmware-quartz64a 2> /dev/null)" lt-nl 6.5.5-dietpi1
+		if dpkg --compare-versions "$(dpkg-query -Wf '${Version}' firmware-quartz64a 2> /dev/null)" lt-nl 6.5.8-dietpi1
 		then
 			G_DIETPI-NOTIFY 2 'Updating Quartz64 Model A kernel and bootloader ...'
 			G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb 'https://dietpi.com/downloads/binaries/firmware-quartz64a.deb'
 			G_EXEC_OUTPUT=1 G_EXEC dpkg -i --force-confdef,confold package.deb
 			G_EXEC rm package.deb
 
-		elif dpkg --compare-versions "$(dpkg-query -Wf '${Version}' firmware-quartz64b 2> /dev/null)" lt-nl 6.5.5-dietpi1
+		elif dpkg --compare-versions "$(dpkg-query -Wf '${Version}' firmware-quartz64b 2> /dev/null)" lt-nl 6.5.8-dietpi1
 		then
 			G_DIETPI-NOTIFY 2 'Updating Quartz64 Model B kernel and bootloader ...'
 			G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb 'https://dietpi.com/downloads/binaries/firmware-quartz64b.deb'
 			G_EXEC_OUTPUT=1 G_EXEC dpkg -i --force-confdef,confold package.deb
 			G_EXEC rm package.deb
 
-		elif dpkg --compare-versions "$(dpkg-query -Wf '${Version}' firmware-soquartz 2> /dev/null)" lt-nl 6.5.5-dietpi1
+		elif dpkg --compare-versions "$(dpkg-query -Wf '${Version}' firmware-soquartz 2> /dev/null)" lt-nl 6.5.8-dietpi1
 		then
 			G_DIETPI-NOTIFY 2 'Updating SOQuartz kernel and bootloader ...'
 			G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb 'https://dietpi.com/downloads/binaries/firmware-soquartz.deb'
@@ -1443,24 +1462,6 @@ _EOF_
 			G_EXEC rm package.deb
 		fi
 
-	# Orange Pi 5: Fix fdtfile entry
-	elif (( $G_HW_MODEL == 80 )) && grep -q '^fdtfile=$' /boot/dietpiEnv.txt
-	then
-		G_DIETPI-NOTIFY 2 'Fixing fdtfile entry in dietpiEnv.txt ...'
-		G_EXEC sed -i '/^fdtfile=$/d' /boot/dietpiEnv.txt
-	fi
-}
-
-Patch_8_23()
-{
-	# RPi: Update raspberrypi-sys-mods: https://github.com/MichaIng/DietPi/issues/6666
-	if (( $G_HW_MODEL < 10 )) && dpkg --compare-versions "$(dpkg-query -Wf '${Version}' raspberrypi-sys-mods 2> /dev/null)" lt-nl 2:20230510-dietpi2
-	then
-		G_DIETPI-NOTIFY 2 'Updating raspberrypi-sys-mods package ...'
-		G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb 'https://dietpi.com/downloads/binaries/raspberrypi-sys-mods.deb'
-		G_EXEC_OUTPUT=1 G_EXEC dpkg -i --force-confdef,confold package.deb
-		G_EXEC rm package.deb
-
 	# VisionFive 2
 	elif (( $G_HW_MODEL == 81 )) && dpkg --compare-versions "$(dpkg-query -Wf '${Version}' linux-image-visionfive2 2> /dev/null)" lt-nl 6.1.58-dietpi2
 	then