dietpi-installer: install Orange Pi 5 Plus Ethernet udev rule on vendor kernel only

* define SBC model and kernel family explicitly for all supported models, but skip the rarely used `$arch` variable: instead obtian it right before it gets used when compiling the boot script. Exit with an error if an unknown hardware ID was passed (which should not happen, as this is checked during hardware selection before already).
* add some comments about features still unsupported by mainline Linux, where vendor Linux is used
* fix `$TEST_KERNEL` handling, which was trying to remove still two downloaded packags, while only one is downloaded after we merged linux-dtb into linux-image
* Install zstd on all Armbian base images. We cannot easily check whether the kernel supporrts it, but all that we support do, and if they don't, there needs to be an adjusted initramfs config anyway, to prevent initramfs-tools from compressing with zstd, as installing a well known compression tool must not cause a failing boot. If it does, this is better recognized on the fresh image, than some random time later, when the admin installs zstd for some reason.
* for completeness, make clear Broadcom WiFi is Cypress is Infineon nowadays
* dietpi-globals: G_AGP: fix removal of uninstalled packages from the command, after `--allow-change-held-packages` was removed
* dietpi-set_hardware: consider hci_uart as Bluetooth module on NanoPi M5, as it is used by the official Xunlong M.2 WiFi/BT card

Author: MichaIng

.build/images/dietpi-installer

@@ -1106,37 +1106,38 @@ _EOF_
 			fi
 
 			# Select kernel, device tree and U-Boot packages
-			local model='odroidn2' kernel='meson64' arch='arm64' branch='current'
+			local model='' kernel='' branch='current'
 			case $G_HW_MODEL in
-				10) model='odroidc1' kernel='meson' arch='arm';;
-				11) model='odroidxu4' kernel='odroidxu4' arch='arm';;
-				12) model='odroidc2';;
-				16) model='odroidc4';;
-				17) model='odroidhc4';;
+				10) model='odroidc1' kernel='meson';;
+				11) model='odroidxu4' kernel='odroidxu4';;
+				12) model='odroidc2' kernel='meson64';;
+				15) model='odroidn2' kernel='meson64';;
+				16) model='odroidc4' kernel='meson64';;
+				17) model='odroidhc4' kernel='meson64';;
 				40) model='pine64' kernel='sunxi64';;
 				42) model='rockpro64' kernel='rockchip64';;
 				43) model='rock64' kernel='rockchip64';;
 				44) model='pinebook-a64' kernel='sunxi64';;
 				45) model='pineh64-b' kernel='sunxi64';;
 				46) model='pinebook-pro' kernel='rockchip64';;
 				47) model='nanopi-r4s' kernel='rockchip64';;
-				48) model='nanopi-r1' kernel='sunxi' arch='arm';;
-				52) model='tinkerboard' kernel='rockchip' arch='arm';;
-				54) model='nanopik2-s905';;
+				48) model='nanopi-r1' kernel='sunxi';;
+				52) model='tinkerboard' kernel='rockchip';;
+				54) model='nanopik2-s905' kernel='meson64';;
 				55) model='nanopi-r2s' kernel='rockchip64';;
 				56) model='nanopineo3' kernel='rockchip64';;
 				57) model='nanopineoplus2' kernel='sunxi64';;
 				58) model='nanopim4v2' kernel='rockchip64';;
-				59) model='zeropi' kernel='sunxi' arch='arm';;
-				60) model='nanopineo' kernel='sunxi' arch='arm';;
-				63) model='nanopim1' kernel='sunxi' arch='arm';;
-				64) model='nanopiair' kernel='sunxi' arch='arm';;
+				59) model='zeropi' kernel='sunxi';;
+				60) model='nanopineo' kernel='sunxi';;
+				63) model='nanopim1' kernel='sunxi';;
+				64) model='nanopiair' kernel='sunxi';;
 				65) kernel='sunxi64'
 					case $HW_VARIANT in
 						2) model='nanopineo2black';;
 						*) model='nanopineo2';;
 					esac;;
-				66) model='nanopim1plus' kernel='sunxi' arch='arm';;
+				66) model='nanopim1plus' kernel='sunxi';;
 				67) model='nanopik1plus' kernel='sunxi64';;
 				68) kernel='rockchip64'
 					case $HW_VARIANT in
@@ -1174,21 +1175,21 @@ _EOF_
 				88) model='orangepizero2w' kernel='sunxi64';;
 				89) model='orangepi3-lts' kernel='sunxi64';;
 				90) model='radxa-zero3' kernel='rockchip64';;
-				91) model='orangepi5-max' kernel='rk35xx' branch='vendor';;
+				91) model='orangepi5-max' kernel='rk35xx' branch='vendor';; # mainline Linux dts does not support onboard WiFi, and brcmfmac probably does neither
 				92) model='nanopi-m6' kernel='rk35xx' branch='vendor';;
 				93) model='orangepi5pro' kernel='rk35xx' branch='vendor';;
-				94) model='orangepi5-ultra' kernel='rk35xx' branch='vendor';;
+				94) model='orangepi5-ultra' kernel='rk35xx' branch='vendor';; # mainline Linux dts does not support onboard WiFi, and brcmfmac probably does neither
 				95) model='orangepicm5' kernel='rk35xx' branch='vendor';;
 				96) model='orangepi-4a' kernel='sunxi64' branch='edge';;
 				99) model='orangepi3' kernel='sunxi64';;
 				100) model='nanopi-r3s' kernel='rockchip64';;
 				101) model='nanopi-r3s-lts' kernel='rockchip64';;
 				102) model='nanopi-r76s' kernel='rk35xx' branch='vendor';; # mainline U-Boot does not support eMMC boot, and vendor U-Boot does not support eMMC boot with mainline Linux either. It looks like U-Boot would (needs to) load the device tree from the eMMC Linux hardcoded path /boot/dtb/rockchip/rk3576-nanopi-r75s.dtb, and that needs to be from vendor kernel. Weird ...
-				103) model='nanopi-m5' kernel='rk35xx' branch='vendor';;
+				103) model='nanopi-m5' kernel='rk35xx' branch='vendor';; # mainline Linux does not support UFS and the upper USB port
 				104) model='nanopi-zero2' kernel='rk35xx' branch='vendor';;
 				105) model='orangepi4-lts' kernel='rockchip64';;
 				106) model='orangepi5b' kernel='rk35xx' branch='vendor';;
-				*) :;;
+				*) G_DIETPI-NOTIFY 1 "Unknown hardware ID \"$G_HW_MODEL\". Aborting ..."; exit 1;;
 			esac
 
 			# Override with mainline kernel if wanted
@@ -1247,7 +1248,7 @@ fi' /boot/boot.cmd
 			then
 				G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb "https://dietpi.com/downloads/binaries/testing/linux-image-$branch-$kernel.deb"
 				G_EXEC_OUTPUT=1 G_EXEC dpkg -i package.deb
-				G_EXEC rm package[12].deb
+				G_EXEC rm package.deb
 			fi
 
 			# Install testing U-Boot build if requested
@@ -1269,6 +1270,8 @@ fi' /boot/boot.cmd
 			[[ -f '/boot/uEnv.txt' ]] && G_EXEC rm /boot/uEnv.txt
 
 			# Compile U-Boot script
+			local arch='arm'
+			(( $G_HW_ARCH == 3 )) && arch='arm64'
 			[[ -f '/boot/boot.cmd' ]] && G_EXEC mkimage -C none -A "$arch" -T script -d /boot/boot.cmd /boot/boot.scr
 
 			# Flash U-Boot
@@ -1465,7 +1468,7 @@ _EOF_
 			done
 
 			# Add initramfs-tools and u-boot-tools, required to convert initramfs images into legacy U-Boot format
-			aPACKAGES_REQUIRED_INSTALL+=('initramfs-tools' 'u-boot-tools')
+			aPACKAGES_REQUIRED_INSTALL+=('initramfs-tools' 'zstd' 'u-boot-tools')
 
 			# Generate and cleanup legacy uInitrd, still needed by Armbian boot.scr, which we do not touch here
 			local arch='arm'
@@ -1559,7 +1562,7 @@ _EOF_
 				if (( $WIFI_REQUIRED ))
 				then
 					aPACKAGES_REQUIRED_INSTALL+=('firmware-atheros')		# Qualcomm Atheros WiFi
-					aPACKAGES_REQUIRED_INSTALL+=('firmware-brcm80211')		# Broadcom WiFi
+					aPACKAGES_REQUIRED_INSTALL+=('firmware-brcm80211')		# Broadcom/Cypress/Infineon WiFi
 					aPACKAGES_REQUIRED_INSTALL+=('firmware-iwlwifi')		# Intel WiFi
 					# Trixie splits the free and misc packages:
 					# - https://packages.debian.org/trixie/firmware-linux-free
@@ -2184,8 +2187,8 @@ SUBSYSTEM=="net", KERNEL=="eth0", KERNELS=="0000:21:00.0", RUN:="/bin/true"
 SUBSYSTEM=="net", KERNEL=="eth1", KERNELS=="0000:01:00.0", NAME="to_eth0", RUN:="/bin/true"
 SUBSYSTEM=="net", KERNEL=="to_eth0", RUN="/bin/ip l s dev eth0 name eth1", RUN+="/bin/ip l s dev to_eth0 name eth0", RUN+="/bin/udevadm trigger -c add /sys/class/net/eth0 /sys/class/net/eth1"
 _EOF_
-		# Orange Pi 5 Plus
-		elif (( $G_HW_MODEL == 82 ))
+		# Orange Pi 5 Plus with vendor kernel
+		elif [[ $G_HW_MODEL == 82 && $kernel == 'rk35xx' ]]
 		then
 			G_DIETPI-NOTIFY 2 'Assuring persistent classic Ethernet interface names: /etc/udev/rules.d/99-dietpi-orangepi5plus.rules'
 			cat << '_EOF_' > /etc/udev/rules.d/99-dietpi-orangepi5plus.rules

dietpi/func/dietpi-globals

@@ -1580,9 +1580,9 @@ Press any key to continue...'
 		G_EXEC_PRE_FUNC()
 		{
 			local apackages=()
-			mapfile -t apackages < <(dpkg --get-selections "${acommand[@]:4}" 2> /dev/null | mawk '{print $1}')
+			mapfile -t apackages < <(dpkg --get-selections "${acommand[@]:3}" 2> /dev/null | mawk '{print $1}')
 			# shellcheck disable=SC2015
-			[[ ${apackages[0]} ]] && acommand=("${acommand[@]::4}" "${apackages[@]}") || acommand=(G_DIETPI-NOTIFY 2 'None of the packages are currently installed. Aborting...')
+			[[ ${apackages[0]} ]] && acommand=("${acommand[@]::3}" "${apackages[@]}") || acommand=(G_DIETPI-NOTIFY 2 'None of the packages are currently installed. Aborting...')
 		}
 
 		G_EXEC_DESC="\e[0mAPT purge \e[33m$*\e[0m"

dietpi/func/dietpi-set_hardware

@@ -1157,6 +1157,7 @@ _EOF_
 
 		case $G_HW_MODEL in
 			[0-9]) (( $G_HW_ONBOARD_WIFI )) && aBLUETOOTH_MODULES+=('hci_uart');; # RPi. This kernel module is used by other SBCs, but e.g. on ROCK 4 SE it is needed as well for WiFi: https://github.com/MichaIng/DietPi/issues/6943
+			103) aBLUETOOTH_MODULES+=('hci_uart');; # NanoPi M5 official M.2 WiFi card
 			83|88|89|99|105) aBLUETOOTH_MODULES+=('sprdbt_tty');; # Orange Pi Zero 3/Zero 2W/3 LTS/3/4 LTS
 			87) [[ $G_HW_REVISION == '1.1' ]] && aBLUETOOTH_MODULES+=('sprdbt_tty');; # Orange Pi 3B v1.1
 			*) :;;