Release v9.0 (MichaIng#6860)

.build/images/dietpi-build

@@ -79,58 +79,59 @@ case $HW_MODEL in
 	0) iname='RPi' HW_ARCH=${HW_ARCH:-1} boot_size=128 root_size=895;;
 	10) iname='OdroidC1' HW_ARCH=2 partition_start=4 boot_size=128 root_size=700 boot_fstype='fat16';;
 	11) iname='OdroidXU4' HW_ARCH=2 partition_start=4 root_size=764;;
-	12) iname='OdroidC2' HW_ARCH=3 partition_start=4 root_size=764;;
-	15) iname='OdroidN2' HW_ARCH=3 partition_start=4 root_size=764;;
-	16) iname='OdroidC4' HW_ARCH=3 partition_start=4 root_size=764;;
+	12) iname='OdroidC2' HW_ARCH=3 partition_start=4 root_size=892;;
+	15) iname='OdroidN2' HW_ARCH=3 partition_start=4 root_size=892;;
+	16) iname='OdroidC4' HW_ARCH=3 partition_start=4 root_size=892;;
 	20) iname='VM' HW_ARCH=${HW_ARCH:-10} VMTYPE=${VMTYPE:-raw};;
 	21) iname='NativePC-BIOS' HW_ARCH=10 root_size=1215;;
-	40) iname='PINEA64' HW_ARCH=3 partition_start=4 root_size=764;;
-	42) iname='ROCKPro64' HW_ARCH=3 partition_start=16 root_size=752;;
-	43) iname='ROCK64' HW_ARCH=3 partition_start=16 root_size=752;;
-	44) iname='Pinebook' HW_ARCH=3 partition_start=4 root_size=764;;
-	45) iname='PINEH64' HW_ARCH=3 partition_start=4 root_size=764;;
-	46) iname='PinebookPro' HW_ARCH=3 partition_start=16 root_size=752;;
-	47) iname='NanoPiR4S' HW_ARCH=3 partition_start=16 root_size=752;;
+	40) iname='PINEA64' HW_ARCH=3 partition_start=4 root_size=892;;
+	42) iname='ROCKPro64' HW_ARCH=3 partition_start=16 root_size=880;;
+	43) iname='ROCK64' HW_ARCH=3 partition_start=16 root_size=880;;
+	44) iname='Pinebook' HW_ARCH=3 partition_start=4 root_size=892;;
+	45) iname='PINEH64' HW_ARCH=3 partition_start=4 root_size=892;;
+	46) iname='PinebookPro' HW_ARCH=3 partition_start=16 root_size=880;;
+	47) iname='NanoPiR4S' HW_ARCH=3 partition_start=16 root_size=880;;
 	48) iname='NanoPiR1' HW_ARCH=2 partition_start=4 root_size=764;;
 	'49.1') iname='Quartz64A' HW_ARCH=3 partition_start=16 root_size=752;;
 	'49.2') iname='Quartz64B' HW_ARCH=3 partition_start=16 root_size=752;;
 	'49.3') iname='SOQuartz' HW_ARCH=3 partition_start=16 root_size=752;;
 	52) iname='ASUSTB' HW_ARCH=2 partition_start=4 root_size=764;;
-	54) iname='NanoPiK2' HW_ARCH=3 partition_start=4 root_size=764;;
-	55) iname='NanoPiR2S' HW_ARCH=3 partition_start=16 root_size=752;;
-	56) iname='NanoPiNEO3' HW_ARCH=3 partition_start=16 root_size=752;;
-	57) iname='NanoPiNEOPlus2' HW_ARCH=3 partition_start=4 root_size=764;;
-	58) iname='NanoPiM4V2' HW_ARCH=3 partition_start=16 root_size=752;;
+	54) iname='NanoPiK2' HW_ARCH=3 partition_start=4 root_size=892;;
+	55) iname='NanoPiR2S' HW_ARCH=3 partition_start=16 root_size=880;;
+	56) iname='NanoPiNEO3' HW_ARCH=3 partition_start=16 root_size=880;;
+	57) iname='NanoPiNEOPlus2' HW_ARCH=3 partition_start=4 root_size=892;;
+	58) iname='NanoPiM4V2' HW_ARCH=3 partition_start=16 root_size=880;;
 	59) iname='ZeroPi' HW_ARCH=2 partition_start=4 root_size=764;;
 	60) iname='NanoPiNEO' HW_ARCH=2 partition_start=4 root_size=764;;
 	61) iname='NanoPiM2' HW_ARCH=2 partition_start=4 boot_size=64 root_size=572 boot_fstype='ext4';;
-	'62.1') iname='NanoPiM3' HW_ARCH=3 partition_start=4 root_size=572;;
-	'62.2') iname='NanoPiFire3' HW_ARCH=3 partition_start=4 root_size=572;;
+	'62.1') iname='NanoPiM3' HW_ARCH=3 partition_start=4 root_size=700;;
+	'62.2') iname='NanoPiFire3' HW_ARCH=3 partition_start=4 root_size=700;;
 	63) iname='NanoPiM1' HW_ARCH=2 partition_start=4 root_size=764;;
 	64) iname='NanoPiNEOAir' HW_ARCH=2 partition_start=4 root_size=764;;
-	'65.1') iname='NanoPiNEO2' HW_ARCH=3 partition_start=4 root_size=764;;
-	'65.2') iname='NanoPiNEO2Black' HW_ARCH=3 partition_start=4 root_size=764;;
+	'65.1') iname='NanoPiNEO2' HW_ARCH=3 partition_start=4 root_size=892;;
+	'65.2') iname='NanoPiNEO2Black' HW_ARCH=3 partition_start=4 root_size=892;;
 	66) iname='NanoPiM1Plus' HW_ARCH=2 partition_start=4 root_size=764;;
-	67) iname='NanoPiK1Plus' HW_ARCH=3 partition_start=4 root_size=764;;
-	'68.1') iname='NanoPiM4' HW_ARCH=3 partition_start=16 root_size=752;;
-	'68.2') iname='NanoPCT4' HW_ARCH=3 partition_start=16 root_size=752;;
-	'68.3') iname='NanoPiNEO4' HW_ARCH=3 partition_start=16 root_size=752;;
+	67) iname='NanoPiK1Plus' HW_ARCH=3 partition_start=4 root_size=892;;
+	'68.1') iname='NanoPiM4' HW_ARCH=3 partition_start=16 root_size=880;;
+	'68.2') iname='NanoPCT4' HW_ARCH=3 partition_start=16 root_size=880;;
+	'68.3') iname='NanoPiNEO4' HW_ARCH=3 partition_start=16 root_size=880;;
 	70) iname='SparkySBC' HW_ARCH=2 partition_start=8 boot_size=48 root_size=712 boot_fstype='fat16';;
-	72) iname='ROCKPi4' HW_ARCH=3 partition_start=16 root_size=752;;
-	73) iname='ROCKPiS' HW_ARCH=3 partition_start=16 root_size=752;;
-	74) iname='RadxaZero' HW_ARCH=3 partition_start=4 root_size=764;;
+	72) iname='ROCKPi4' HW_ARCH=3 partition_start=16 root_size=880;;
+	73) iname='ROCKPiS' HW_ARCH=3 partition_start=16 root_size=880;;
+	74) iname='RadxaZero' HW_ARCH=3 partition_start=4 root_size=892;;
 	75) iname='Container' HW_ARCH=${HW_ARCH:-10} root_size=447;;
 	76) iname='NanoPiR5S' HW_ARCH=3 root_size=752;; # Special case: Skips image file, partitioning and filesystem generation, but runs debootstrap only!
-	77) iname='ROCK3A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=752;;
-	78) iname='ROCK5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=752;;
+	77) iname='ROCK3A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=880;;
+	78) iname='ROCK5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=880;;
 	79) iname='NanoPi6' HW_ARCH=3 root_size=752;; # Special case: Skips image file, partitioning and filesystem generation, but runs debootstrap only!
-	80) iname='OrangePi5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=752;;
+	80) iname='OrangePi5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=880;;
 	81) iname='VisionFive2' HW_ARCH=11 root_size=639;;
-	82) iname='OrangePi5Plus' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=752;;
-	83) iname='OrangePiZero3' HW_ARCH=3 partition_start=4 root_size=752;;
+	82) iname='OrangePi5Plus' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=880;;
+	'83.1') iname='OrangePiZero3' HW_ARCH=3 partition_start=4 root_size=892;;
+	'83.2') iname='OrangePiZero3-1.5G' HW_ARCH=3 partition_start=4 root_size=892;;
 	84) iname='Star64' HW_ARCH=11 root_size=639;;
-	85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=752;;
-	86) iname='ASUSTB2' HW_ARCH=3 partition_start=16 root_size=752;;
+	85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=880;;
+	86) iname='ASUSTB2' HW_ARCH=3 partition_start=16 root_size=880;;
 	87) iname='OrangePi3B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=880;;
 	*) G_DIETPI-NOTIFY 1 "Invalid hardware model \"$HW_MODEL\" passed, aborting..."; exit 1;;
 esac
@@ -147,7 +148,7 @@ fi
 repo='https://deb.debian.org/debian/'
 keyring='/usr/share/keyrings/debian-archive-keyring.gpg'
 case $HW_ARCH in
-	1) iarch='ARMv6' parch='armhf' repo='http://raspbian.raspberrypi.org/raspbian/' keyring='/usr/share/keyrings/raspbian-archive-keyring.gpg';;
+	1) iarch='ARMv6' parch='armhf' repo='http://raspbian.raspberrypi.com/raspbian/' keyring='/usr/share/keyrings/raspbian-archive-keyring.gpg';;
 	2) iarch='ARMv7' parch='armhf';;
 	3) iarch='ARMv8' parch='arm64';;
 	10) iarch='x86_64' parch='amd64';;
@@ -157,7 +158,6 @@ esac
 
 exclude=
 case $DISTRO in
-	5) distro='buster'; [[ $HW_MODEL == 75 ]] || { G_DIETPI-NOTIFY 1 "Invalid distro \"$DISTRO\" passed, aborting..."; exit 1; };;
 	6) distro='bullseye' exclude=',gcc-8-base,gcc-9-base';;
 	7|8)
 		exclude=',gcc-8-base,gcc-9-base,gcc-10-base,gcc-11-base'
@@ -420,9 +420,6 @@ infocmp "$TERM" > /dev/null 2>&1 || { echo "[ WARN ] Unsupported TERM=\"$TERM\",
 echo '[ INFO ] Running DietPi-Installer...'
 _EOF_
 
-# Workaround for failing HTTPS validation on ARMv6/7 Buster (don't ask me why neither ARMv8 nor x86_64 are affected...)
-(( $DISTRO == 5 && $HW_ARCH < 3 )) && G_EXEC eval 'echo '\''c_rehash'\'' >> rootfs/etc/rc.local'
-
 cat << _EOF_ >> rootfs/etc/rc.local
 export GITOWNER='$GITOWNER' GITBRANCH='$GITBRANCH' HW_MODEL='$HW_MODEL' IMAGE_CREATOR=0 PREIMAGE_INFO=0 WIFI_REQUIRED=1 DISTRO_TARGET=$DISTRO
 echo '[ INFO ] Running DietPi-Installer for $G_GITOWNER/$G_GITBRANCH'

.build/images/dietpi-installer

@@ -4,7 +4,7 @@
 	# Install DietPi on any Debian system
 	#------------------------------------------------------------------------------------------------
 	# REQUIREMENTS
-	# - Currently running Debian Buster or above, ideally minimal, e.g. Raspberry Pi OS Lite-ish =))
+	# - Currently running Debian Bullseye or above, ideally minimal, e.g. Raspberry Pi OS Lite-ish =))
 	# - systemd as system/init/service manager
 	# - Either Ethernet connection or local (non-SSH) terminal access
 	#------------------------------------------------------------------------------------------------
@@ -173,12 +173,7 @@ _EOF_
 
 	# Detect the distro version of this operating system
 	distro=$(</etc/debian_version)
-	if [[ $distro == '10.'* || $distro == 'buster/sid' ]]
-	then
-		G_DISTRO=5
-		G_DISTRO_NAME='buster'
-
-	elif [[ $distro == '11.'* || $distro == 'bullseye/sid' ]]
+	if [[ $distro == '11.'* || $distro == 'bullseye/sid' ]]
 	then
 		G_DISTRO=6
 		G_DISTRO_NAME='bullseye'
@@ -391,7 +386,8 @@ _EOF_
 						'87' ': Orange Pi 3B'
 						'80' ': Orange Pi 5'
 						'82' ': Orange Pi 5 Plus'
-						'83' ': Orange Pi Zero 3'
+						'83.1' ': Orange Pi Zero 3'
+						'83.2' ': Orange Pi Zero 3 (1.5 GB RAM)'
 						'86' ': ASUS Tinker Board 2'
 						'23' ': Generic Rockchip RK3328'
 						'24' ': Generic Rockchip RK3399'
@@ -519,8 +515,6 @@ _EOF_
 			do
 				[[ $DISTRO_TARGET == "$i" ]] && break 2
 			done
-			# Allow secret Buster builds for containers, required for our own software builds
-			[[ $G_HW_MODEL == 75 && $DISTRO_TARGET == 5 ]] && break
 
 			G_WHIP_DEFAULT_ITEM=${G_WHIP_MENU_ARRAY[0]} # First item matches current distro version
 			G_WHIP_BUTTON_CANCEL_TEXT='Exit'
@@ -533,11 +527,7 @@ _EOF_
 			exit 0
 		done
 
-		if (( $DISTRO_TARGET == 5 ))
-		then
-			DISTRO_TARGET_NAME='buster'
-
-		elif (( $DISTRO_TARGET == 6 ))
+		if (( $DISTRO_TARGET == 6 ))
 		then
 			DISTRO_TARGET_NAME='bullseye'
 
@@ -791,7 +781,7 @@ setenv rootuuid "true"' /boot/boot.cmd
 			# Bootstrap RPi repo if key is missing
 			if [[ ! $(apt-key list 'CF8A1AF502A2AA2D763BAE7E82B129927FA3303E' 2> /dev/null) ]]
 			then
-				G_EXEC curl -sSf 'https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-archive-keyring/raspberrypi-archive-keyring_2021.1.1+rpt1_all.deb' -o keyring.deb
+				G_EXEC curl -sSf 'https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-archive-keyring/raspberrypi-archive-keyring_2021.1.1+rpt1_all.deb' -o keyring.deb
 				G_EXEC dpkg -i keyring.deb
 				G_EXEC rm keyring.deb
 			fi
@@ -900,6 +890,7 @@ _EOF_
 		else
 			aPACKAGES_REQUIRED_INSTALL+=(
 				'console-setup'		# DietPi-Config keyboard configuration + console fonts
+				'dropbear'		# DietPi default SSH server
 				'ethtool'		# Force Ethernet link speed
 				'fake-hwclock'		# Hardware clock emulation, to allow correct timestamps during boot before network time sync
 				'ifupdown'		# Network interface configuration
@@ -930,16 +921,6 @@ _EOF_
 				fi
 			fi
 
-			# Dropbear: DietPi default SSH server
-			# - On Buster, "dropbear" pulls in "dropbear-initramfs", which we don't need: https://packages.debian.org/dropbear
-			# - This needs to depend on current distro version instead of target version, to assure "dropbear-run" does not get autoremoved before "dropbear" is installed.
-			if (( $G_DISTRO > 5 ))
-			then
-				aPACKAGES_REQUIRED_INSTALL+=('dropbear')
-			else
-				aPACKAGES_REQUIRED_INSTALL+=('dropbear-run')
-			fi
-
 			# All but VMs: Drive power management control
 			(( $G_HW_MODEL == 20 )) || aPACKAGES_REQUIRED_INSTALL+=('hdparm')
 		fi
@@ -1283,7 +1264,9 @@ _EOF_
 			# Install kernel and U-Boot packages
 			G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb 'https://dietpi.com/downloads/binaries/linux-image-next-sun50iw9.deb'
 			G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb 'https://dietpi.com/downloads/binaries/linux-dtb-next-sun50iw9.deb'
-			G_EXEC_OUTPUT=1 G_EXEC curl -fo package3.deb 'https://dietpi.com/downloads/binaries/linux-u-boot-orangepizero3-next.deb'
+			local variant=
+			(( $HW_VARIANT == 2 )) && variant='_1.5G'
+			G_EXEC_OUTPUT=1 G_EXEC curl -fo package3.deb "https://dietpi.com/downloads/binaries/linux-u-boot-orangepizero3-next$variant.deb"
 			G_EXEC_OUTPUT=1 G_EXEC dpkg -i package1.deb package2.deb package3.deb
 			G_EXEC rm package1.deb package2.deb package3.deb
 
@@ -1510,13 +1493,6 @@ _EOF_
 		G_AGI "${aPACKAGES_REQUIRED_INSTALL[@]}"
 		unset -v aPACKAGES_REQUIRED_INSTALL
 
-		# Adjust Dropbear package marks when Buster was upgraded to Bullseye
-		if dpkg-query -s 'dropbear-run' &> /dev/null
-		then
-			G_EXEC apt-mark manual dropbear
-			G_EXEC apt-mark auto dropbear-run
-		fi
-
 		G_AGA
 
 		# Remove temporary APT configs

.build/software/Amiberry/build.bash

@@ -9,11 +9,11 @@ G_DIETPI-NOTIFY 2 "Amiberry will be built for platform: \e[33m$PLATFORM"
 # APT dependencies
 # - wget: Used for WHDLoad database update: https://github.com/BlitterStudio/amiberry/commit/d6c103e
 # - kbd: For "chvt" used in systemd service
-adeps_build=('autoconf' 'make' 'g++' 'pkg-config' 'libdrm-dev' 'libgbm-dev' 'libudev-dev' 'libxml2-dev' 'libpng-dev' 'libfreetype6-dev' 'libflac-dev' 'libmpg123-dev' 'libmpeg2-4-dev' 'libasound2-dev' 'libserialport-dev' 'wget' 'kbd')
-adeps=('libdrm2' 'libgl1-mesa-dri' 'libgbm1' 'libegl1' 'libudev1' 'libxml2' 'libpng16-16' 'libfreetype6' 'libmpg123-0' 'libmpeg2-4' 'libasound2' 'libserialport0' 'wget' 'kbd')
+adeps_build=('autoconf' 'make' 'cmake' 'g++' 'pkg-config' 'libdrm-dev' 'libgbm-dev' 'libudev-dev' 'libxml2-dev' 'libpng-dev' 'libfreetype6-dev' 'libflac-dev' 'libmpg123-dev' 'libmpeg2-4-dev' 'libasound2-dev' 'libserialport-dev' 'libportmidi-dev' 'wget' 'kbd')
+adeps=('libdrm2' 'libgl1-mesa-dri' 'libgbm1' 'libegl1' 'libudev1' 'libxml2' 'libpng16-16' 'libfreetype6' 'libmpg123-0' 'libmpeg2-4' 'libasound2' 'libserialport0' 'libportmidi0' 'wget' 'kbd')
 (( $G_DISTRO > 6 )) && adeps+=('libflac12') || adeps+=('libflac8')
-# - DispmanX deps for RPi
-[[ $PLATFORM == 'rpi'* ]] && adeps_build+=('libraspberrypi-dev') adeps+=('libraspberrypi0')
+# - Deps for RPi DispmanX builds
+[[ $PLATFORM == 'rpi'[1-5] || $PLATFORM == 'rpi'[345]'-64-dmx' ]] && adeps_build+=('libraspberrypi-dev') adeps+=('libraspberrypi0')
 # - Graphics rendering flags and deps
 (( $G_HW_ARCH == 10 )) && opengl_flags=('--disable-video-opengles2' '--enable-video-opengl') adeps_build+=('libgl1-mesa-dev') adeps+=('libgl1') || opengl_flags=('--enable-video-opengles2' '--disable-video-opengl') adeps_build+=('libgles2-mesa-dev') adeps+=('libgles2')
 
@@ -95,6 +95,9 @@ then
 	G_EXEC tar xf master.tar.gz
 	G_EXEC rm master.tar.gz
 	G_EXEC cd capsimg-master
+	# RISC-V: "checking build system type... ./config.guess: unable to guess system type"
+	G_EXEC curl -sSfo CAPSImg/config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
+	G_EXEC curl -sSfo CAPSImg/config.sub 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
 	G_EXEC_OUTPUT=1 G_EXEC ./bootstrap
 	G_EXEC_OUTPUT=1 G_EXEC ./configure CFLAGS='-g0 -O3' CXXFLAGS='-g0 -O3'
 	G_EXEC_OUTPUT=1 G_EXEC make "-j$(nproc)"
@@ -114,7 +117,10 @@ G_EXEC curl -sSfLO "https://github.com/BlitterStudio/amiberry/archive/v$v_ami.ta
 G_EXEC tar xf "v$v_ami.tar.gz"
 G_EXEC rm "v$v_ami.tar.gz"
 G_EXEC cd "amiberry-$v_ami"
-G_EXEC_OUTPUT=1 G_EXEC make "-j$(nproc)" "PLATFORM=$PLATFORM" # Passing flags here overrides some mandatory flags in the Makefile, where -O3 is set as well.
+# - RISC-V: Workaround for missing ld.gold: https://github.com/BlitterStudio/amiberry/issues/1213
+RISCV_LD=()
+(( $G_HW_ARCH == 11 )) && RISCV_LD=('USE_LD=bfd')
+G_EXEC_OUTPUT=1 G_EXEC make "-j$(nproc)" "PLATFORM=$PLATFORM" "${RISCV_LD[@]}" # Passing flags here overrides some mandatory flags in the Makefile, where -O3 is set as well.
 G_EXEC strip --remove-section=.comment --remove-section=.note amiberry
 
 # Prepare DEB package

.build/software/Amiberry/container_build.bash

@@ -46,10 +46,11 @@ do
 done
 [[ $DISTRO =~ ^('buster'|'bullseye'|'bookworm'|'trixie')$ ]] || Error_Exit "Invalid distro \"$DISTRO\" passed"
 case $PLATFORM in
-	'rpi1') image="ARMv6-${DISTRO^}" arch=1;;
-	'rpi'[234]|'c1'|'xu4'|'RK3288'|'sun8i'|'s812') image="ARMv7-${DISTRO^}" arch=2;;
-	'rpi'[34]'-64-dmx'|'AMLSM1'|'n2'|'a64'|'rk3588') image="ARMv8-${DISTRO^}" arch=3;;
+	'rpi1'*) image="ARMv6-${DISTRO^}" arch=1;;
+	'rpi'[345]'-64-'*|'AMLSM1'|'n2'|'a64'|'rk3588') image="ARMv8-${DISTRO^}" arch=3;;
+	'rpi'[2-5]*|'c1'|'xu4'|'RK3288'|'sun8i'|'s812') image="ARMv7-${DISTRO^}" arch=2;;
 	'x86-64') image="x86_64-${DISTRO^}" arch=10;;
+	'riscv64') image='RISC-V-Sid' arch=11;;
 	*) Error_Exit "Invalid platform \"$PLATFORM\" passed";;
 esac
 image="DietPi_Container-$image.img"
@@ -118,11 +119,11 @@ G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.
 # Avoid DietPi-Survey uploads to not mess with the statistics
 G_EXEC rm rootfs/root/.ssh/known_hosts
 
-# RPi 64-bit: Add RPi repo, ARMv6 container images contain it already
-if [[ $PLATFORM == 'rpi'[234]* ]]
+# RPi: Add RPi repo, ARMv6 container images contain it already
+if [[ $PLATFORM == 'rpi'[2-5]* ]]
 then
-	G_EXEC eval "echo 'deb https://archive.raspberrypi.org/debian/ ${DISTRO/trixie/bookworm} main' > rootfs/etc/apt/sources.list.d/raspi.list"
-	G_EXEC curl -sSf 'https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-archive-keyring/raspberrypi-archive-keyring_2021.1.1+rpt1_all.deb' -o keyring.deb
+	G_EXEC eval "echo 'deb https://archive.raspberrypi.com/debian/ ${DISTRO/trixie/bookworm} main' > rootfs/etc/apt/sources.list.d/raspi.list"
+	G_EXEC curl -sSf 'https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-archive-keyring/raspberrypi-archive-keyring_2021.1.1+rpt1_all.deb' -o keyring.deb
 	G_EXEC dpkg --root=rootfs -i keyring.deb
 	G_EXEC rm keyring.deb
 	# Enforce Debian Trixie FFmpeg packages over RPi repo ones

.build/software/dietpi-software-build.bash

@@ -48,7 +48,7 @@ do
 done
 [[ $NAME =~ ^('gmediarender'|'gogs'|'shairport-sync'|'squeezelite'|'vaultwarden'|'ympd')$ ]] || Error_Exit "Invalid software title \"$NAME\" passed"
 [[ $NAME == 'gogs' ]] && EXT='7z' || EXT='deb'
-[[ $DISTRO =~ ^('buster'|'bullseye'|'bookworm'|'trixie')$ ]] || Error_Exit "Invalid distro \"$DISTRO\" passed"
+[[ $DISTRO =~ ^('bullseye'|'bookworm'|'trixie')$ ]] || Error_Exit "Invalid distro \"$DISTRO\" passed"
 case $ARCH in
 	'armv6l') image="ARMv6-${DISTRO^}" arch=1;;
 	'armv7l') image="ARMv7-${DISTRO^}" arch=2;;

.build/software/squeezelite/build.bash

@@ -9,7 +9,7 @@ G_AGDUG make gcc libc6-dev libasound2-dev libflac-dev libmad0-dev libvorbis-dev
 # Runtime deps
 adeps=('libc6' 'libasound2' 'libmad0' 'libvorbisfile3' 'libmpg123-0' 'libsoxr0' 'liblirc-client0' 'libfaad2' 'libopus0')
 case $G_DISTRO in
-	5|6) adeps+=('libflac8' 'libavformat58' 'libssl1.1');;
+	6) adeps+=('libflac8' 'libavformat58' 'libssl1.1');;
 	7) adeps+=('libflac12' 'libavformat59' 'libssl3');;
 	8) adeps+=('libflac12' 'libavformat60' 'libssl3');;
 	*) G_DIETPI-NOTIFY 1 "Unsupported distro version: $G_DISTRO_NAME (ID=$G_DISTRO)"; exit 1;;

.build/software/ympd/build.bash

@@ -4,14 +4,12 @@
 
 # Build deps
 G_AGUP
-# - ARMv6 Buster: Prevent install of 3.16.3-3~bpo10+1 from RPi repo, which breaks build: "list sub-command REMOVE_ITEM requires two or more arguments."
-(( $G_HW_ARCH == 1 && $G_DISTRO == 5 )) && G_EXEC eval 'echo -e '\''Package: cmake cmake-data\nPin: origin archive.raspberrypi.org\nPin-Priority: -1'\'' > /etc/apt/preferences.d/dietpi-cmake'
 G_AGDUG cmake make gcc libc6-dev pkg-config libmpdclient-dev libssl-dev
 
 # Runtime deps
 adeps=('libc6' 'libmpdclient2')
 case $G_DISTRO in
-	5|6) adeps+=('libssl1.1');;
+	6) adeps+=('libssl1.1');;
 	7|8) adeps+=('libssl3');;
 	*) G_DIETPI-NOTIFY 1 "Unsupported distro version: $G_DISTRO_NAME (ID=$G_DISTRO)"; exit 1;;
 esac

.conf/desktop/apps/kodi.desktop

@@ -3,7 +3,7 @@ Version=1.0
 Name=Kodi Media Center
 GenericName=Media Center
 Comment=Manage and view your media
-Exec=/boot/dietpi/misc/start_kodi
+Exec=kodi --standalone
 Icon=/var/lib/dietpi/dietpi-software/installed/desktop/icons/kodi-icon.png
 Terminal=false
 Type=Application