v8.25

- dietpi-rpi-firmware-migration | Install 2712 on 64-bit userland only, as it does not support 32-bit: RPi-Distro/repo#356
MichaIng · Dec 15, 2023 · 0148418 · 0148418
1 parent 0b7dc0b
commit 0148418
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.meta/dietpi-rpi-firmware-migration b/.meta/dietpi-rpi-firmware-migration
@@ -39,14 +39,17 @@ G_EXEC ln -s firmware/cmdline.txt /boot/cmdline.txt
 G_EXEC ln -s firmware/config.txt /boot/config.txt
 
 # Install new firmware packages
-apackages=('linux-image-rpi-v8' 'linux-image-rpi-2712')
-dpkg-query -s 'raspberrypi-kernel-headers' &> /dev/null && apackages+=('linux-headers-rpi-v8' 'linux-headers-rpi-2712')
+apackages=('linux-image-rpi-v8')
+dpkg-query -s 'raspberrypi-kernel-headers' &> /dev/null && apackages+=('linux-headers-rpi-v8')
 if [[ $(dpkg --print-architecture) == 'armhf' ]]
 then
 	apackages+=('linux-image-rpi-v6' 'linux-image-rpi-v7' 'linux-image-rpi-v7l')
 	dpkg-query -s 'raspberrypi-kernel-headers' &> /dev/null && apackages+=('linux-headers-rpi-v6' 'linux-headers-rpi-v7' 'linux-headers-rpi-v7l')
 	# Add foreign arm64 arch until the 64-bit kernel package has been added to the armhf repo: https://github.com/RPi-Distro/repo/issues/356
 	G_EXEC dpkg --add-architecture arm64
+else	
+	apackages+=('linux-image-rpi-2712')
+	dpkg-query -s 'raspberrypi-kernel-headers' &> /dev/null && apackages+=('linux-headers-rpi-2712')
 fi
 G_AGUP
 G_AGI "${apackages[@]}" raspi-firmware