Merge pull request #7900 from MichaIng/beta

Release v10.0

Author: MichaIng

.build/images/Quartz64/quartz64_defconfig

@@ -163,6 +163,8 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DRM=y
+CONFIG_DRM_ACCEL=y
+CONFIG_DRM_ACCEL_ROCKET=m
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DW_HDMI_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -206,8 +208,7 @@ CONFIG_EEPROM_AT25=m
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_ENERGY_MODEL=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXTCON_ADC_JACK=y

.build/images/dietpi-build

@@ -45,7 +45,7 @@ G_EXEC cd "$FP_ORIGIN" # Process everything in origin dir instead of /tmp/$G_PRO
 ##########################################
 HW_MODEL=
 HW_ARCH=
-DISTRO=8 # 6=Bullseye, 7=Bookworm, 8=Trixie, 9=Forky
+DISTRO=8 # 7=Bookworm, 8=Trixie, 9=Forky
 PTTYPE='msdos'
 FSTYPE='ext4'
 VARIANT=
@@ -128,9 +128,6 @@ case $HW_MODEL in
 	58) iname='NanoPiM4V2' HW_ARCH=3 partition_start=16 root_size=1200;;
 	59) iname='ZeroPi' HW_ARCH=2 partition_start=4 root_size=1000;;
 	60) iname='NanoPiNEO' HW_ARCH=2 partition_start=4 root_size=1000;;
-	61) iname='NanoPiM2' HW_ARCH=2 partition_start=4 boot_size=64 root_size=700 boot_fstype='ext4';;
-	'62.1') iname='NanoPiM3' HW_ARCH=3 partition_start=4 root_size=1000;;
-	'62.2') iname='NanoPiFire3' HW_ARCH=3 partition_start=4 root_size=1000;;
 	63) iname='NanoPiM1' HW_ARCH=2 partition_start=4 root_size=1000;;
 	64) iname='NanoPiNEOAir' HW_ARCH=2 partition_start=4 root_size=1000;;
 	'65.1') iname='NanoPiNEO2' HW_ARCH=3 partition_start=4 root_size=1020;;
@@ -140,7 +137,6 @@ case $HW_MODEL in
 	'68.1') iname='NanoPiM4' HW_ARCH=3 partition_start=16 root_size=1200;;
 	'68.2') iname='NanoPCT4' HW_ARCH=3 partition_start=16 root_size=1200;;
 	'68.3') iname='NanoPiNEO4' HW_ARCH=3 partition_start=16 root_size=1200;;
-	70) iname='SparkySBC' HW_ARCH=2 partition_start=8 boot_size=48 root_size=712 boot_fstype='fat16';;
 	'72.1') iname='ROCKPi4' HW_ARCH=3 partition_start=16 root_size=1200;;
 	'72.2') iname='ROCK4SE' HW_ARCH=3 partition_start=16 root_size=1200;;
 	'72.3') iname='ROCK4CPlus' HW_ARCH=3 partition_start=16 root_size=1200;;
@@ -199,7 +195,6 @@ esac
 
 # Check for valid target distro version
 case $DISTRO in
-	6) distro='bullseye';;
 	7) distro='bookworm';;
 	8) distro='trixie';;
 	9) distro='forky';;
@@ -217,7 +212,7 @@ esac
 fsname='' afspackages=() afs_opts=() afsck=() aresize=() apackages=()
 case $FSTYPE in
 	'ext4') afspackages+=('e2fsprogs') afs_opts=('-e' 'remount-ro' '-O' '^has_journal') afsck=('e2fsck' '-fyD') aresize=('resize2fs');;
-	'f2fs') fsname='F2FS' afspackages+=('f2fs-tools') afsck=('fsck.f2fs' '-f') aresize=('resize.f2fs'); uname -r | grep -q '-azure$' && apackages+=("linux-modules-extra-$(uname -r)");;
+	'f2fs') fsname='F2FS' afspackages+=('f2fs-tools') afsck=('fsck.f2fs' '-f') aresize=('resize.f2fs'); uname -r | grep -q '\-azure$' && apackages+=("linux-modules-extra-$(uname -r)");;
 	'btrfs') fsname='Btrfs' afspackages+=('btrfs-progs') afsck=('btrfs' 'check' '--repair') aresize=('btrfs' 'filesystem' 'resize' 'max'); ((root_size*=5,root_size/=4));;
 	*) Error_Exit "Invalid root filesystem type \"$FSTYPE\" passed";;
 esac
@@ -381,8 +376,8 @@ then
 	G_EXEC "mkfs.$FSTYPE" "${afs_opts[@]}" "${FP_LOOP}p2"
 	G_EXEC mount "${FP_LOOP}p2" rootfs
 	fp_boot='boot'
-	# RPi Bookworm: Expects /boot/firmware as mount point
-	(( $HW_MODEL < 10 && $G_DISTRO > 6 )) && fp_boot+='/firmware'
+	# RPi: Expects /boot/firmware as mount point
+	(( $HW_MODEL < 10 )) && fp_boot+='/firmware'
 	G_EXEC mkdir -p "rootfs/$fp_boot"
 	G_EXEC mount "${FP_LOOP}p1" "rootfs/$fp_boot"
 	G_EXEC mkdir rootfs/etc
@@ -431,20 +426,16 @@ G_EXEC umount rootfs/dev rootfs/run rootfs/var/cache/apt rootfs/var/lib/apt/list
 ##########################################
 # Workarounds
 ##########################################
-# Workaround for failing systemd services in emulated container: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
+# Workarounds for QEMU-emulated containers
 if (( $emulation ))
 then
+	# Failing systemd services: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
 	for i in rootfs/lib/systemd/system/*.service
 	do
 		[[ -f $i ]] || continue
-		grep -Eq '^(Load|Import)Credential=' "$i" || continue
+		grep -Eq '^(Import|Load)Credential=' "$i" || continue
 		G_EXEC mkdir "${i/lib/etc}.d"
-		if (( $DISTRO < 8 ))
-		then
-			G_EXEC eval "echo -e '[Service]\nLoadCredential=' > \"${i/lib/etc}.d/dietpi-no-credentials.conf\""
-		else
-			G_EXEC eval "echo -e '[Service]\nImportCredential=' > \"${i/lib/etc}.d/dietpi-no-credentials.conf\""
-		fi
+		G_EXEC eval "echo -e '[Service]\nImportCredential=\nLoadCredential=' > '${i/lib/etc}.d/dietpi-no-credentials.conf'"
 	done
 fi
 
@@ -455,11 +446,11 @@ then
 	echo -e "#/bin/dash\n[ \"\$*\" = -m ] && echo $arch || /bin/uname \"\$@\"" > rootfs/usr/local/bin/uname && G_EXEC chmod +x rootfs/usr/local/bin/uname || Error_Exit "Failed to generate /usr/local/bin/uname for $arch"
 fi
 
-# ARMv6/7 Trixie: Workaround failing chpasswd, which tries to access /proc/sys/vm/mmap_min_addr, but fails as of AppArmor on the host
-if (( $HW_ARCH < 3 && $DISTRO == 8 )) && systemctl -q is-active apparmor
+# ARMv6/7/RISC-V Trixie: Workaround failing chpasswd, which tries to access /proc/sys/vm/mmap_min_addr, but fails as of AppArmor on the host
+if (( ( $HW_ARCH < 3 || $HW_ARCH == 11 ) && $DISTRO == 8 )) && systemctl -q is-active apparmor
 then
 	G_EXEC eval 'echo '\''/proc/sys/vm/mmap_min_addr r,'\'' > /etc/apparmor.d/local/unix-chkpwd'
-	G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 systemctl restart apparmor || { journalctl -n 25; exit 1; }
+	G_EXEC_OUTPUT=1 G_EXEC apparmor_parser -r /etc/apparmor.d/unix-chkpwd
 fi
 
 ##########################################
@@ -520,7 +511,7 @@ IMAGER_ARGS=("$OUTPUT_IMG_NAME.img")
 (( $SKIP_ARCHIVE )) && IMAGER_ARGS+=('--skip-archive')
 [[ $UPLOAD_SCRIPT ]] && IMAGER_ARGS+=('--upload-script' "$UPLOAD_SCRIPT")
 (( $ADD_FAT_PART )) && IMAGER_ARGS+=('--add-fat-part')
-(( $HW_MODEL < 10 && $G_DISTRO > 6 )) && IMAGER_ARGS+=('--configs-to-boot')
+(( $HW_MODEL < 10 )) && IMAGER_ARGS+=('--configs-to-boot')
 [[ $SIGN_PASS ]] && IMAGER_ARGS+=('--sign' "$SIGN_PASS")
 
 ####### IMG/ISO ##########################
@@ -558,7 +549,7 @@ then
 
 	# Mount filesystems
 	G_EXEC mkdir rootfs
-	if (( $HW_MODEL < 10 && $G_DISTRO > 6 ))
+	if (( $HW_MODEL < 10 ))
 	then
 		G_EXEC mount "${FP_LOOP}p2" rootfs
 		G_EXEC mount "${FP_LOOP}p1" rootfs/boot/firmware
@@ -589,7 +580,7 @@ fi
 
 ####### AlloGUI ##########################
 # - Pre-install Allo GUI with all managed audiophile software
-if [[ $EDITION == 'AlloGUI' || ( $EDITION == 'all' && $HW_MODEL =~ ^([1-5]|70)$ ) ]]
+if [[ $EDITION == 'AlloGUI' || ( $EDITION == 'all' && $HW_MODEL == [1-5] ) ]]
 then
 	G_EXEC mv "$OUTPUT_IMG_NAME.img" "${OUTPUT_IMG_NAME%_Amiberry}_AlloGUI.img"
 	OUTPUT_IMG_NAME="${OUTPUT_IMG_NAME%_Amiberry}_AlloGUI"
@@ -611,7 +602,7 @@ then
 
 	# Mount filesystems
 	G_EXEC mkdir rootfs
-	if (( $HW_MODEL < 10 && $G_DISTRO > 6 ))
+	if (( $HW_MODEL < 10 ))
 	then
 		G_EXEC mount "${FP_LOOP}p2" rootfs
 		G_EXEC mount "${FP_LOOP}p1" rootfs/boot/firmware

.build/images/dietpi-imager

@@ -28,7 +28,6 @@
 		G_EXEC rm /tmp/dietpi-globals
 		read -r debian_version < /etc/debian_version
 		case $debian_version in
-			'11.'*|'bullseye/sid') G_DISTRO=6;;
 			'12.'*|'bookworm/sid') G_DISTRO=7;;
 			'13.'*|'trixie/sid') G_DISTRO=8;;
 			'14.'*|'forky/sid') G_DISTRO=9;;
@@ -389,15 +388,7 @@
 		(( $SKIP_ARCHIVE )) || deps+=('xz-utils')
 		if [[ $CLONING_TOOL == 'Clonezilla' ]]
 		then
-			deps+=('unzip' 'parted' 'partclone' 'syslinux-common' 'xorriso' 'isolinux')
-			# - Bullseye/Focal: We need Clonezilla 5.x for loop device support
-			if (( $G_DISTRO < 7 ))
-			then
-				G_EXEC curl -sSfo clonezilla.deb 'https://deb.debian.org/debian/pool/main/c/clonezilla/clonezilla_5.3.17-2_all.deb'
-				deps+=('./clonezilla')
-			else
-				deps+=('clonezilla')
-			fi
+			deps+=('clonezilla' 'unzip' 'parted' 'partclone' 'syslinux-common' 'xorriso' 'isolinux')
 
 		elif [[ $PART_TABLE_TYPE == 'gpt' ]]
 		then
@@ -409,7 +400,6 @@
 		# Shrink last filesystem to minimum
 		# - resize2fs: "Please run 'e2fsck -f /dev/loop0p1' first."
 		Run_fsck
-		# - Use sfdisk to detect last partition, as lsblk with "-r" option on Bullseye does not sort partitions well: https://github.com/MichaIng/DietPi/issues/7527
 		local last_part_dev=$(sfdisk -lqo Device "$FP_SOURCE" | tail -1)
 		# - If this is a tailing DietPi setup partition, remove it and let it be recreated freshly in case. This makes it easier for dietpi-build to reuse the same image for multiple variants.
 		if [[ $(blkid -s LABEL -o value "$last_part_dev") == 'DIETPISETUP' ]]
@@ -805,7 +795,7 @@ _EOF_
 		if [[ $SIGN_PASS ]]
 		then
 			G_DIETPI-NOTIFY 2 "Signing $FP_FINAL ..."
-			gpg --batch --pinentry-mode loopback --passphrase "$SIGN_PASS" -b --armor "$FP_FINAL" || Exit_Error 'Signing failed, please check your signing key and passphase'
+			gpg --batch --pinentry-mode loopback --passphrase "$SIGN_PASS" -b --armor "$FP_FINAL" || Error_Exit 'Signing failed, please check your signing key and passphase'
 			result_text+="\nSignature:   $FP_FINAL.asc\n$(<"$FP_FINAL.asc")"
 			upload_list+=("$FP_FINAL.asc")
 		fi