Skip to content

Commit c6d6207

Browse files
MichaIngMichaIng
authored
Merge pull request #7875 from MichaIng/dev
Beta v10.0.0
2 parents 95ae415 + 209c38b commit c6d6207

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+965
-2708
lines changed

‎.build/images/Quartz64/quartz64_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ CONFIG_DM_CRYPT=m
163163
CONFIG_DM_MIRROR=m
164164
CONFIG_DM_ZERO=m
165165
CONFIG_DRM=y
166+
CONFIG_DRM_ACCEL=y
167+
CONFIG_DRM_ACCEL_ROCKET=m
166168
CONFIG_DRM_DISPLAY_CONNECTOR=m
167169
CONFIG_DRM_DW_HDMI_CEC=y
168170
CONFIG_DRM_I2C_ADV7511=m
@@ -206,8 +208,7 @@ CONFIG_EEPROM_AT25=m
206208
CONFIG_EFIVAR_FS=y
207209
CONFIG_EFI_CAPSULE_LOADER=y
208210
CONFIG_ENERGY_MODEL=y
209-
CONFIG_EXT2_FS=y
210-
CONFIG_EXT3_FS=y
211+
CONFIG_EXT4_FS=y
211212
CONFIG_EXT4_FS_POSIX_ACL=y
212213
CONFIG_EXT4_FS_SECURITY=y
213214
CONFIG_EXTCON_ADC_JACK=y

‎.build/images/dietpi-build‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ G_EXEC cd "$FP_ORIGIN" # Process everything in origin dir instead of /tmp/$G_PRO
4545
##########################################
4646
HW_MODEL=
4747
HW_ARCH=
48-
DISTRO=8 # 6=Bullseye, 7=Bookworm, 8=Trixie, 9=Forky
48+
DISTRO=8 # 7=Bookworm, 8=Trixie, 9=Forky
4949
PTTYPE='msdos'
5050
FSTYPE='ext4'
5151
VARIANT=
@@ -128,9 +128,6 @@ case $HW_MODEL in
128128
58) iname='NanoPiM4V2' HW_ARCH=3 partition_start=16 root_size=1200;;
129129
59) iname='ZeroPi' HW_ARCH=2 partition_start=4 root_size=1000;;
130130
60) iname='NanoPiNEO' HW_ARCH=2 partition_start=4 root_size=1000;;
131-
61) iname='NanoPiM2' HW_ARCH=2 partition_start=4 boot_size=64 root_size=700 boot_fstype='ext4';;
132-
'62.1') iname='NanoPiM3' HW_ARCH=3 partition_start=4 root_size=1000;;
133-
'62.2') iname='NanoPiFire3' HW_ARCH=3 partition_start=4 root_size=1000;;
134131
63) iname='NanoPiM1' HW_ARCH=2 partition_start=4 root_size=1000;;
135132
64) iname='NanoPiNEOAir' HW_ARCH=2 partition_start=4 root_size=1000;;
136133
'65.1') iname='NanoPiNEO2' HW_ARCH=3 partition_start=4 root_size=1020;;
@@ -140,7 +137,6 @@ case $HW_MODEL in
140137
'68.1') iname='NanoPiM4' HW_ARCH=3 partition_start=16 root_size=1200;;
141138
'68.2') iname='NanoPCT4' HW_ARCH=3 partition_start=16 root_size=1200;;
142139
'68.3') iname='NanoPiNEO4' HW_ARCH=3 partition_start=16 root_size=1200;;
143-
70) iname='SparkySBC' HW_ARCH=2 partition_start=8 boot_size=48 root_size=712 boot_fstype='fat16';;
144140
'72.1') iname='ROCKPi4' HW_ARCH=3 partition_start=16 root_size=1200;;
145141
'72.2') iname='ROCK4SE' HW_ARCH=3 partition_start=16 root_size=1200;;
146142
'72.3') iname='ROCK4CPlus' HW_ARCH=3 partition_start=16 root_size=1200;;
@@ -199,7 +195,6 @@ esac
199195

200196
# Check for valid target distro version
201197
case $DISTRO in
202-
6) distro='bullseye';;
203198
7) distro='bookworm';;
204199
8) distro='trixie';;
205200
9) distro='forky';;
@@ -381,8 +376,8 @@ then
381376
G_EXEC "mkfs.$FSTYPE" "${afs_opts[@]}" "${FP_LOOP}p2"
382377
G_EXEC mount "${FP_LOOP}p2" rootfs
383378
fp_boot='boot'
384-
# RPi Bookworm: Expects /boot/firmware as mount point
385-
(( $HW_MODEL < 10 && $G_DISTRO > 6 )) && fp_boot+='/firmware'
379+
# RPi: Expects /boot/firmware as mount point
380+
(( $HW_MODEL < 10 )) && fp_boot+='/firmware'
386381
G_EXEC mkdir -p "rootfs/$fp_boot"
387382
G_EXEC mount "${FP_LOOP}p1" "rootfs/$fp_boot"
388383
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
431426
##########################################
432427
# Workarounds
433428
##########################################
434-
# Workaround for failing systemd services in emulated container: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
429+
# Workarounds for QEMU-emulated containers
435430
if (( $emulation ))
436431
then
432+
# Failing systemd services: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
437433
for i in rootfs/lib/systemd/system/*.service
438434
do
439435
[[ -f $i ]] || continue
440-
grep -Eq '^(Load|Import)Credential=' "$i" || continue
436+
grep -Eq '^(Import|Load)Credential=' "$i" || continue
441437
G_EXEC mkdir "${i/lib/etc}.d"
442-
if (( $DISTRO < 8 ))
443-
then
444-
G_EXEC eval "echo -e '[Service]\nLoadCredential=' > \"${i/lib/etc}.d/dietpi-no-credentials.conf\""
445-
else
446-
G_EXEC eval "echo -e '[Service]\nImportCredential=' > \"${i/lib/etc}.d/dietpi-no-credentials.conf\""
447-
fi
438+
G_EXEC eval "echo -e '[Service]\nImportCredential=\nLoadCredential=' > '${i/lib/etc}.d/dietpi-no-credentials.conf'"
448439
done
449440
fi
450441

@@ -455,11 +446,11 @@ then
455446
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"
456447
fi
457448

458-
# ARMv6/7 Trixie: Workaround failing chpasswd, which tries to access /proc/sys/vm/mmap_min_addr, but fails as of AppArmor on the host
459-
if (( $HW_ARCH < 3 && $DISTRO == 8 )) && systemctl -q is-active apparmor
449+
# 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
450+
if (( ( $HW_ARCH < 3 || $HW_ARCH == 11 ) && $DISTRO == 8 )) && systemctl -q is-active apparmor
460451
then
461452
G_EXEC eval 'echo '\''/proc/sys/vm/mmap_min_addr r,'\'' > /etc/apparmor.d/local/unix-chkpwd'
462-
G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 systemctl restart apparmor || { journalctl -n 25; exit 1; }
453+
G_EXEC_OUTPUT=1 G_EXEC apparmor_parser -r /etc/apparmor.d/unix-chkpwd
463454
fi
464455

465456
##########################################
@@ -520,7 +511,7 @@ IMAGER_ARGS=("$OUTPUT_IMG_NAME.img")
520511
(( $SKIP_ARCHIVE )) && IMAGER_ARGS+=('--skip-archive')
521512
[[ $UPLOAD_SCRIPT ]] && IMAGER_ARGS+=('--upload-script' "$UPLOAD_SCRIPT")
522513
(( $ADD_FAT_PART )) && IMAGER_ARGS+=('--add-fat-part')
523-
(( $HW_MODEL < 10 && $G_DISTRO > 6 )) && IMAGER_ARGS+=('--configs-to-boot')
514+
(( $HW_MODEL < 10 )) && IMAGER_ARGS+=('--configs-to-boot')
524515
[[ $SIGN_PASS ]] && IMAGER_ARGS+=('--sign' "$SIGN_PASS")
525516

526517
####### IMG/ISO ##########################
@@ -558,7 +549,7 @@ then
558549

559550
# Mount filesystems
560551
G_EXEC mkdir rootfs
561-
if (( $HW_MODEL < 10 && $G_DISTRO > 6 ))
552+
if (( $HW_MODEL < 10 ))
562553
then
563554
G_EXEC mount "${FP_LOOP}p2" rootfs
564555
G_EXEC mount "${FP_LOOP}p1" rootfs/boot/firmware
@@ -589,7 +580,7 @@ fi
589580

590581
####### AlloGUI ##########################
591582
# - Pre-install Allo GUI with all managed audiophile software
592-
if [[ $EDITION == 'AlloGUI' || ( $EDITION == 'all' && $HW_MODEL =~ ^([1-5]|70)$ ) ]]
583+
if [[ $EDITION == 'AlloGUI' || ( $EDITION == 'all' && $HW_MODEL == [1-5] ) ]]
593584
then
594585
G_EXEC mv "$OUTPUT_IMG_NAME.img" "${OUTPUT_IMG_NAME%_Amiberry}_AlloGUI.img"
595586
OUTPUT_IMG_NAME="${OUTPUT_IMG_NAME%_Amiberry}_AlloGUI"
@@ -611,7 +602,7 @@ then
611602

612603
# Mount filesystems
613604
G_EXEC mkdir rootfs
614-
if (( $HW_MODEL < 10 && $G_DISTRO > 6 ))
605+
if (( $HW_MODEL < 10 ))
615606
then
616607
G_EXEC mount "${FP_LOOP}p2" rootfs
617608
G_EXEC mount "${FP_LOOP}p1" rootfs/boot/firmware

‎.build/images/dietpi-imager‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
G_EXEC rm /tmp/dietpi-globals
2929
read -r debian_version < /etc/debian_version
3030
case $debian_version in
31-
'11.'*|'bullseye/sid') G_DISTRO=6;;
3231
'12.'*|'bookworm/sid') G_DISTRO=7;;
3332
'13.'*|'trixie/sid') G_DISTRO=8;;
3433
'14.'*|'forky/sid') G_DISTRO=9;;
@@ -389,15 +388,7 @@
389388
(( $SKIP_ARCHIVE )) || deps+=('xz-utils')
390389
if [[ $CLONING_TOOL == 'Clonezilla' ]]
391390
then
392-
deps+=('unzip' 'parted' 'partclone' 'syslinux-common' 'xorriso' 'isolinux')
393-
# - Bullseye/Focal: We need Clonezilla 5.x for loop device support
394-
if (( $G_DISTRO < 7 ))
395-
then
396-
G_EXEC curl -sSfo clonezilla.deb 'https://deb.debian.org/debian/pool/main/c/clonezilla/clonezilla_5.3.17-2_all.deb'
397-
deps+=('./clonezilla')
398-
else
399-
deps+=('clonezilla')
400-
fi
391+
deps+=('clonezilla' 'unzip' 'parted' 'partclone' 'syslinux-common' 'xorriso' 'isolinux')
401392

402393
elif [[ $PART_TABLE_TYPE == 'gpt' ]]
403394
then
@@ -409,7 +400,6 @@
409400
# Shrink last filesystem to minimum
410401
# - resize2fs: "Please run 'e2fsck -f /dev/loop0p1' first."
411402
Run_fsck
412-
# - 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
413403
local last_part_dev=$(sfdisk -lqo Device "$FP_SOURCE" | tail -1)
414404
# - 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.
415405
if [[ $(blkid -s LABEL -o value "$last_part_dev") == 'DIETPISETUP' ]]
@@ -805,7 +795,7 @@ _EOF_
805795
if [[ $SIGN_PASS ]]
806796
then
807797
G_DIETPI-NOTIFY 2 "Signing $FP_FINAL ..."
808-
gpg --batch --pinentry-mode loopback --passphrase "$SIGN_PASS" -b --armor "$FP_FINAL" || Exit_Error 'Signing failed, please check your signing key and passphase'
798+
gpg --batch --pinentry-mode loopback --passphrase "$SIGN_PASS" -b --armor "$FP_FINAL" || Error_Exit 'Signing failed, please check your signing key and passphase'
809799
result_text+="\nSignature: $FP_FINAL.asc\n$(<"$FP_FINAL.asc")"
810800
upload_list+=("$FP_FINAL.asc")
811801
fi

0 commit comments

Comments
 (0)