Release v9.14 (#7585)

Author: MichaIng

.build/images/OdroidXU4/boot.ini

@@ -126,14 +126,12 @@ setenv bootrootfs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait ro console=ttySA
 
 ### DO NOT EDIT ANYTHING BELOW THIS LINE ###
 
-# Load kernel, initrd and dtb in that sequence
-load mmc 0:1 0x40008000 /boot/zImage || load mmc 0:1 0x40008000 zImage
-load mmc 0:1 0x42000000 /boot/uInitrd || load mmc 0:1 0x42000000 uInitrd
+# Load device tree
 if test "${board_name}" = "xu4"; then setenv fdtfile "exynos5422-odroidxu4.dtb"; fi
 if test "${board_name}" = "xu3"; then setenv fdtfile "exynos5422-odroidxu3.dtb"; fi
 if test "${board_name}" = "xu3l"; then setenv fdtfile "exynos5422-odroidxu3-lite.dtb"; fi
 if test "${board_name}" = "hc1"; then setenv fdtfile "exynos5422-odroidhc1.dtb"; fi
-load mmc 0:1 0x44000000 /boot/dtb/${fdtfile} || load mmc 0:1 0x44000000 dtb/${fdtfile}
+load mmc 0:1 0x44000000 "/boot/dtb/${fdtfile}" || load mmc 0:1 0x44000000 "dtb/${fdtfile}"
 
 # Set FDT address
 fdt addr 0x44000000
@@ -156,7 +154,7 @@ fi
 if test "x${overlays}" != "x"; then
     fdt resize 8192
     for overlay in ${overlays}; do
-        load mmc 0:1 0x60000000 /boot/dtb/${overlay}.dtbo || load mmc 0:1 0x60000000 /boot/dtb/overlays/${overlay}.dtbo || load mmc 0:1 0x60000000 dtb/${overlay}.dtbo || load mmc 0:1 0x60000000 dtb/overlays/${overlay}.dtbo
+        load mmc 0:1 0x60000000 "/boot/dtb/${overlay}.dtbo" || load mmc 0:1 0x60000000 "/boot/dtb/overlays/${overlay}.dtbo" || load mmc 0:1 0x60000000 "dtb/${overlay}.dtbo" || load mmc 0:1 0x60000000 "dtb/overlays/${overlay}.dtbo"
         fdt apply 0x60000000
     done
 fi
@@ -167,5 +165,9 @@ if test "x${ddr_freq}" != "x"; then dmc "${ddr_freq}"; fi
 # Final boot args (DRM debugging: drm.debug=0xff)
 setenv bootargs "${bootrootfs} ${videoconfig} ${hid_quirks}"
 
+# Load kernel and initramfs last, for U-Boot to set ${filesize}, needed to load raw initrd
+load mmc 0:1 0x40008000 /boot/zImage || load mmc 0:1 0x40008000 zImage
+load mmc 0:1 0x42000000 /boot/initrd.img || load mmc 0:1 0x42000000 initrd.img
+
 # Boot the board
-bootz 0x40008000 0x42000000 0x44000000
+bootz 0x40008000 "0x42000000:${filesize}" 0x44000000

.build/images/U-Boot/99-dietpi-uboot

@@ -1,5 +1,3 @@
-#!/bin/dash
-echo 'update-initramfs: Converting to U-Boot format'
-mkimage -A arm64 -O linux -T ramdisk -C gzip -n uInitrd -d "$2" "/boot/uInitrd-$1"
-ln -sfv "uInitrd-$1" /boot/uInitrd
+#!/bin/dash -e
+ln -sfv "initrd.img-$1" /boot/initrd.img
 exit 0

.build/images/U-Boot/99-dietpi-uboot-legacy

@@ -0,0 +1,5 @@
+#!/bin/dash -e
+echo 'update-initramfs: Converting to U-Boot format'
+mkimage -A arm -O linux -T ramdisk -C gzip -n uInitrd -d "$2" "/boot/uInitrd-$1"
+mv -v "/boot/uInitrd-$1" /boot/uInitrd
+exit 0

.build/images/U-Boot/boot.cmd

@@ -10,40 +10,41 @@ setenv rootdev "/dev/mmcblk0p1"
 setenv rootfstype "ext4"
 setenv consoleargs "console=tty1"
 setenv docker_optimizations "off"
-setenv overlay_path "amlogic"
-setenv overlay_prefix "meson"
 
 # Load addresses
 setenv scriptaddr "0x32000000"
 setenv kernel_addr_r "0x34000000"
 setenv fdt_addr_r "0x4080000"
-setenv overlay_error "false"
+
+# If this script was loaded from SD/eMMC, get PARTUUID of its first partition for later detection from userland
+if test "${devtype}" = "mmc"; then part uuid mmc "${devnum}:1" partuuid; fi
 
 # Load environment file
 if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dietpiEnv.txt"; then
 	env import -t "${scriptaddr}" "${filesize}"
 fi
 
 # Define kernel command-line arguments
-setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 coherent_pool=2M ${extraargs}"
+setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 coherent_pool=2M partuuid=${partuuid} ${extraargs}"
 
 # Add bootargs for Docker
 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory"; fi
 
-# Load kernel, initramfs and device tree
-load "${devtype}" "${devnum}" "${kernel_addr_r}" "${prefix}Image"
-load "${devtype}" "${devnum}" "${ramdisk_addr_r}" "${prefix}uInitrd"
+# Load device tree and apply overlays
 load "${devtype}" "${devnum}" "${fdt_addr_r}" "${prefix}dtb/${fdtfile}"
 fdt addr "${fdt_addr_r}"
-
-# Apply DT overlays
 if test -n "${overlays}${user_overlays}"; then
+	setenv overlay_error "false"
 	fdt resize 65536
 	for overlay in ${overlays}; do
-		if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dtb/${overlay_path}/overlay/${overlay_prefix}-${overlay}.dtbo"; then
-			echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay}.dtbo"
-			fdt apply "${scriptaddr}" || setenv overlay_error "true"
-		fi
+		for pre in ${overlay_prefix}; do
+			if test -e  "${devtype}" "${devnum}" "${prefix}dtb/${overlay_path}/overlay/${pre}-${overlay}.dtbo"; then
+				if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dtb/${overlay_path}/overlay/${pre}-${overlay}.dtbo"; then
+					echo "Applying kernel provided DT overlay ${pre}-${overlay}.dtbo"
+					fdt apply "${scriptaddr}" || setenv overlay_error "true"
+				fi
+			fi
+		done
 	done
 
 	for overlay in ${user_overlays}; do
@@ -57,10 +58,14 @@ if test -n "${overlays}${user_overlays}"; then
 		echo "Error applying DT overlays, restoring original DT"
 		load "${devtype}" "${devnum}" "${fdt_addr_r}" "${prefix}dtb/${fdtfile}"
 	else
-		if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dtb/${overlay_path}/overlay/${overlay_prefix}-fixup.scr"; then
-			echo "Applying kernel provided DT fixup script ${overlay_prefix}-fixup.scr"
-			source "${scriptaddr}"
-		fi
+		for pre in ${overlay_prefix}; do
+			if test -e "${devtype}" "${devnum}" "${prefix}dtb/${overlay_path}/overlay/${pre}-fixup.scr"; then
+				if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dtb/${overlay_path}/overlay/${pre}-fixup.scr"; then
+					echo "Applying kernel provided DT fixup script ${pre}-fixup.scr"
+					source "${scriptaddr}"
+				fi
+			fi
+		done
 		if test -e "${devtype}" "${devnum}" "${prefix}fixup.scr"; then
 			if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}fixup.scr"; then
 				echo "Applying user provided DT fixup script fixup.scr"
@@ -70,5 +75,9 @@ if test -n "${overlays}${user_overlays}"; then
 	fi
 fi
 
+# Load kernel and initramfs last, for U-Boot to set ${filesize}, needed to load raw initrd
+load "${devtype}" "${devnum}" "${kernel_addr_r}" "${prefix}Image"
+load "${devtype}" "${devnum}" "${ramdisk_addr_r}" "${prefix}initrd.img"
+
 # Boot
-booti "${kernel_addr_r}" "${ramdisk_addr_r}" "${fdt_addr_r}"
+booti "${kernel_addr_r}" "${ramdisk_addr_r}:${filesize}" "${fdt_addr_r}"

.build/images/U-Boot/dietpi-initramfs_cleanup

@@ -1,4 +1,4 @@
-#!/bin/dash
+#!/bin/dash -e
 echo 'Removing obsolete initramfs images'
 find /boot -maxdepth 1 -name 'initrd.img-*' -o -name 'uInitrd-*' | while read -r f
 do

.build/images/U-Boot/dietpiEnv.txt

@@ -5,6 +5,7 @@ consoleargs=console=ttyAML0,115200 console=tty1
 extraargs=net.ifnames=0
 docker_optimizations=off
 overlay_path=amlogic
+# Multiple prefixes are supported separated by space
 overlay_prefix=meson
 overlays=
 user_overlays=

.build/images/dietpi-build

@@ -9,7 +9,7 @@ if [[ -f '/boot/dietpi/func/dietpi-globals' ]]
 then
 	. /boot/dietpi/func/dietpi-globals
 else
-	curl -sSf "https://raw.githubusercontent.com/${G_GITOWNER:=MichaIng}/DietPi/${G_GITBRANCH:=master}/dietpi/func/dietpi-globals" -o /tmp/dietpi-globals || Error_Exit 'Failed to download DietPi-Globals'
+	curl -sSf "https://raw.githubusercontent.com/${G_GITOWNER:=MichaIng}/DietPi/${G_GITBRANCH:=master}/dietpi/func/dietpi-globals" -o /tmp/dietpi-globals || { echo 'Failed to download DietPi-Globals, aborting ...'; exit 1; }
 	# shellcheck disable=SC1091
 	. /tmp/dietpi-globals
 	G_EXEC rm /tmp/dietpi-globals
@@ -18,19 +18,19 @@ else
 	case $debian_version in
 		'12.'*|'bookworm/sid') G_DISTRO=7;;
 		'13.'*|'trixie/sid') G_DISTRO=8;;
-		*) Error_Exit "Unsupported distro version \"$debian_version\". Aborting ...";;
+		*) Error_Exit "Unsupported distro version \"$debian_version\"";;
 	esac
 	# Ubuntu ships with /etc/debian_version from Debian testing, hence we assume one version lower.
 	grep -q '^ID=ubuntu' /etc/os-release && ((G_DISTRO--))
-	(( $G_DISTRO < 7 )) && Error_Exit 'Unsupported Ubuntu version. Aborting ...'
+	(( $G_DISTRO < 7 )) && Error_Exit 'Unsupported Ubuntu version'
 fi
 case $G_HW_ARCH_NAME in
 	'armv6l') export G_HW_ARCH=1;;
 	'armv7l') export G_HW_ARCH=2;;
 	'aarch64') export G_HW_ARCH=3;;
 	'x86_64') export G_HW_ARCH=10;;
 	'riscv64') export G_HW_ARCH=11;;
-	*) Error_Exit "Unsupported host system architecture \"$G_HW_ARCH_NAME\" detected. Aborting ...";;
+	*) Error_Exit "Unsupported host system architecture \"$G_HW_ARCH_NAME\" detected";;
 esac
 readonly G_PROGRAM_NAME='DietPi-Build'
 G_CHECK_ROOT_USER
@@ -77,7 +77,7 @@ do
 		'--sign') shift; SIGN_PASS=$1;;
 		'--test-kernel') TEST_KERNEL=1;;
 		'--test-uboot') TEST_UBOOT=1;;
-		*) Error_Exit "Invalid input \"$1\". Aborting ...";;
+		*) Error_Exit "Invalid input \"$1\"";;
 	esac
 	shift
 done
@@ -99,6 +99,7 @@ case $HW_MODEL in
 	12) iname='OdroidC2' HW_ARCH=3 partition_start=4 root_size=1148;;
 	15) iname='OdroidN2' HW_ARCH=3 partition_start=4 root_size=1148;;
 	16) iname='OdroidC4' HW_ARCH=3 partition_start=4 root_size=1148;;
+	17) iname='OdroidHC4' HW_ARCH=3 partition_start=4 root_size=1148;;
 	20) iname='VM' HW_ARCH=${HW_ARCH:-10} root_size=1200;;
 	21) iname='NativePC' HW_ARCH=10 root_size=1663;;
 	40) iname='PINEA64' HW_ARCH=3 partition_start=4 root_size=1020;;
@@ -147,10 +148,10 @@ case $HW_MODEL in
 	'79.2') iname='NanoPiR6C' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	'79.3') iname='NanoPCT6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	80) iname='OrangePi5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
-	81) iname='VisionFive2' HW_ARCH=11 root_size=639;;
+	81) iname='VisionFive2' HW_ARCH=11 root_size=800;;
 	82) iname='OrangePi5Plus' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	83) iname='OrangePiZero3' HW_ARCH=3 partition_start=4 root_size=1148;;
-	84) iname='Star64' HW_ARCH=11 root_size=639;;
+	84) iname='Star64' HW_ARCH=11 root_size=800;;
 	85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	86) iname='ASUSTB2' HW_ARCH=3 partition_start=16 root_size=1200;;
 	87) iname='OrangePi3B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
@@ -165,38 +166,38 @@ case $HW_MODEL in
 	96) iname='OrangePi4A' HW_ARCH=3 partition_start=4 root_size=1000;;
 	97) iname='OrangePiRV' HW_ARCH=11 partition_start=4 root_size=1000;;
 	98) iname='OrangePiRV2' HW_ARCH=11 partition_start=4 root_size=1000;;
-	*) Error_Exit "Invalid hardware model \"$HW_MODEL\" passed. Aborting ...";;
+	*) Error_Exit "Invalid hardware model \"$HW_MODEL\" passed";;
 esac
 
-[[ $VARIANT =~ ^(|iso|vbox|vmx|esxi|hyperv|utm|proxmox|all)$ ]] || Error_Exit "Invalid variant \"$VARIANT\" passed, aborting ..."
+[[ $VARIANT =~ ^(|iso|vbox|vmx|esxi|hyperv|utm|proxmox|all)$ ]] || Error_Exit "Invalid variant \"$VARIANT\" passed"
 
-[[ $EDITION =~ ^(|Amiberry|AlloGUI|all)$ ]] || Error_Exit "Invalid edition \"$EDITION\" passed. Aborting ..."
+[[ $EDITION =~ ^(|Amiberry|AlloGUI|all)$ ]] || Error_Exit "Invalid edition \"$EDITION\" passed"
 
 # Check for valid target architecture and set variables accordingly
-repo='https://deb.debian.org/debian/'
+mirrors=()
 keyring='/usr/share/keyrings/debian-archive-keyring.gpg'
 case $HW_ARCH in
-	1) arch='armv6l' iarch='ARMv6' parch='armhf' repo='http://raspbian.raspberrypi.com/raspbian/' keyring='/usr/share/keyrings/raspbian-archive-keyring.gpg';;
+	1) arch='armv6l' iarch='ARMv6' parch='armhf' mirrors=('http://raspbian.raspberrypi.com/raspbian') keyring='/usr/share/keyrings/raspbian-archive-keyring.gpg';;
 	2) arch='armv7l' iarch='ARMv7' parch='armhf';;
 	3) arch='aarch64' iarch='ARMv8' parch='arm64';;
 	10) arch='x86_64' iarch='x86_64' parch='amd64';;
 	11) arch='riscv64' iarch='RISC-V' parch='riscv64' DISTRO=8;; # RISC-V architecture is available on Trixie only.
-	*) Error_Exit "Invalid architecture \"$HW_ARCH\" passed. Aborting ...";;
+	*) Error_Exit "Invalid architecture \"$HW_ARCH\" passed";;
 esac
 
 # Check for valid target distro version
 case $DISTRO in
 	6) distro='bullseye';;
 	7) distro='bookworm';;
 	8) distro='trixie';;
-	*) Error_Exit "Invalid distro \"$DISTRO\" passed. Aborting ...";;
+	*) Error_Exit "Invalid distro \"$DISTRO\" passed";;
 esac
 
 # Check for valid partition table type and set variables accordingly
 case $PTTYPE in
 	'msdos') [[ $HW_MODEL == 21 ]] && iname+='-BIOS';;
 	'gpt') [[ $HW_ARCH == 10 ]] && efi_size=64 iname+='-UEFI';;
-	*) Error_Exit "Invalid partition table type \"$PTTYPE\" passed. Aborting ...";;
+	*) Error_Exit "Invalid partition table type \"$PTTYPE\" passed";;
 esac
 
 # Check for valid root filesystem type and set variables accordingly
@@ -205,19 +206,19 @@ case $FSTYPE in
 	'ext4') apackages+=('e2fsprogs') afs_opts=('-e' 'remount-ro') afsck=('e2fsck' '-fyD') aresize=('resize2fs');;
 	'f2fs') fsname='F2FS' apackages+=('f2fs-tools') afsck=('fsck.f2fs' '-f') aresize=('resize.f2fs'); uname -r | grep -q '-azure$' && apackages+=('linux-modules-extra-azure');;
 	'btrfs') fsname='Btrfs' apackages+=('btrfs-progs') afsck=('btrfs' 'check' '--repair') aresize=('btrfs' 'filesystem' 'resize' 'max'); ((root_size+=128));;
-	*) Error_Exit "Invalid root filesystem type \"$FSTYPE\" passed. Aborting ...";;
+	*) Error_Exit "Invalid root filesystem type \"$FSTYPE\" passed";;
 esac
 
 # Validate target Git owner and branch
-G_CHECK_URL "https://github.com/$GITOWNER/DietPi/tree/$GITBRANCH" || Error_Exit "Failed to access Git branch \"$GITBRANCH\". Aborting ..."
+G_CHECK_URL "https://github.com/$GITOWNER/DietPi/tree/$GITBRANCH" || Error_Exit "Failed to access Git branch \"$GITBRANCH\""
 
 # Generate image name and define CLONING_TOOL for dietpi-installer
 OUTPUT_IMG_NAME="DietPi_$iname-$iarch-${distro^}"
 [[ $fsname ]] && OUTPUT_IMG_NAME+="_$fsname"
 CLONING_TOOL='dd'
 if [[ $VARIANT == 'iso' ]]
 then
-	[[ $HW_ARCH == 10 ]] || Error_Exit "Unsupported variant \"$VARIANT\" (installer image) for architecture \"$HW_ARCH\" passed. Aborting ..."
+	[[ $HW_ARCH == 10 ]] || Error_Exit "Unsupported variant \"$VARIANT\" (installer image) for architecture \"$HW_ARCH\" passed"
 	CLONING_TOOL='Clonezilla'
 	OUTPUT_IMG_NAME+='_Installer'
 fi
@@ -391,8 +392,8 @@ _EOF_
 # debootstrap
 ##########################################
 packages='apt,bash-completion,ca-certificates,cron,curl,fdisk,gpg,htop,iputils-ping,locales,mawk,nano,parted,procps,psmisc,sudo,systemd-sysv,tzdata,udev,wget,whiptail,'
-(( $DISTRO > 7 )) && packages+='7zip,' || packages+='p7zip,'
 [[ $HW_MODEL == 75 ]] && packages+='iproute2' || packages+='console-setup,dropbear,ethtool,fake-hwclock,ifupdown,isc-dhcp-client,kmod,rfkill,systemd-timesyncd,usbutils'
+[[ $HW_MODEL =~ ^(20|75)$ ]] || packages+=',iw,wireless-tools,wpasupplicant,wireless-regdb'
 # Add temporary tmpfs mounts to prevent certain files created by debootstrap being written to disk
 # - tmpfs mounts have 1777 mode by default.
 G_EXEC mount -m -t tmpfs tmpfs rootfs/dev
@@ -402,7 +403,7 @@ G_EXEC mount -m -t tmpfs tmpfs rootfs/var/lib/apt/lists
 G_EXEC mount -m -t tmpfs tmpfs rootfs/var/log
 # - "--skip=check/empty" to ignore /etc/fstab, boot and tmpfs mounts we added above
 # - "--skip=check/qemu" to skip arch test, which requires the "arch-test" package. We however assure emulation support our end.
-G_EXEC_OUTPUT=1 G_EXEC mmdebstrap --mode=root --format=dir --skip=check/empty,check/qemu --variant=minbase --include="$packages" --arch="$parch" --keyring="$keyring" "$distro" ./rootfs "$repo"
+G_EXEC_OUTPUT=1 G_EXEC mmdebstrap --mode=root --format=dir --skip=check/empty,check/qemu --variant=apt --include="$packages" --arch="$parch" --keyring="$keyring" "$distro" ./rootfs "${mirrors[@]}"
 G_EXEC umount rootfs/dev rootfs/run rootfs/var/cache/apt rootfs/var/lib/apt/lists rootfs/var/log
 
 ##########################################
@@ -494,7 +495,7 @@ G_EXEC losetup -d "$FP_LOOP"
 # Do not pack and upload raw VM image if not explicitly requested
 [[ $VARIANT =~ ^(|iso|all)$ ]] || SKIP_ARCHIVE=1 UPLOAD_SCRIPT=''
 # Do not add trailing FAT partition for VM, container and ISO installer images, and if there is a boot FAT partition already
-[[ $HW_MODEL == 20 || $HW_MODEL == 75 || $VARIANT == 'iso' || ( $boot_size -gt 0 && $boot_fstype == 'vfat' ) ]] && ADD_DOS_PART=0
+[[ $HW_MODEL =~ ^(20|75)$ || $VARIANT == 'iso' || ( $boot_size -gt 0 && $boot_fstype == 'vfat' ) ]] && ADD_DOS_PART=0
 export FP_ROOT_DEV CLONING_TOOL OUTPUT_IMG_NAME MOUNT_IT='Off' SKIP_FIRSTBOOT_RESIZE=1
 IMAGER_ARGS=("$OUTPUT_IMG_NAME.img")
 (( $SKIP_ARCHIVE )) && IMAGER_ARGS+=('--skip-archive')
@@ -503,7 +504,7 @@ IMAGER_ARGS=("$OUTPUT_IMG_NAME.img")
 [[ $HW_MODEL == [1245] ]] && IMAGER_ARGS+=('--configs-to-boot')
 [[ $SIGN_PASS ]] && IMAGER_ARGS+=('--sign' "$SIGN_PASS")
 # Raspberry Pi Imager info
-[[ $HW_MODEL == [1-5] && $DISTRO == 8 ]] && IMAGER_ARGS+=('--raw-hash-size')
+[[ $HW_MODEL == [1-5] && $DISTRO == 7 ]] && IMAGER_ARGS+=('--raw-hash-size')
 
 ####### IMG/ISO ##########################
 if [[ ! $EDITION || $EDITION == 'all' ]]