Skip to content

Commit 80aec89

Browse files
MichaIngMichaIng
authored
Release v9.17 (#7735)
2 parents f196356 + aaedebb commit 80aec89

38 files changed

+882
-942
lines changed

‎.build/images/Quartz64/quartz64_defconfig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ CONFIG_BROADCOM_PHY=m
5959
CONFIG_BSD_PROCESS_ACCT=y
6060
CONFIG_BSD_PROCESS_ACCT_V3=y
6161
CONFIG_BT=m
62-
CONFIG_BTRFS_FS=m
62+
CONFIG_BTRFS_FS=y
6363
CONFIG_BTRFS_FS_POSIX_ACL=y
6464
CONFIG_BT_BNEP=y
6565
CONFIG_BT_BNEP_MC_FILTER=y
@@ -213,7 +213,10 @@ CONFIG_EXT4_FS_SECURITY=y
213213
CONFIG_EXTCON_ADC_JACK=y
214214
CONFIG_EXTCON_GPIO=y
215215
CONFIG_EXTCON_USB_GPIO=y
216-
CONFIG_F2FS_FS=m
216+
CONFIG_F2FS_CHECK_FS=y
217+
CONFIG_F2FS_FS=y
218+
CONFIG_F2FS_FS_COMPRESSION=y
219+
CONFIG_F2FS_FS_SECURITY=y
217220
CONFIG_FANOTIFY=y
218221
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
219222
CONFIG_FB=y

‎.build/images/dietpi-build‎

Lines changed: 21 additions & 18 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=7 # 6=Bullseye, 7=Bookworm, 8=Trixie, 9=Forky
48+
DISTRO=8 # 6=Bullseye, 7=Bookworm, 8=Trixie, 9=Forky
4949
PTTYPE='msdos'
5050
FSTYPE='ext4'
5151
VARIANT=
@@ -59,6 +59,7 @@ ADD_DOS_PART=1
5959
SIGN_PASS=
6060
TEST_KERNEL=0
6161
TEST_UBOOT=0
62+
RK35XX_MAINLINE=0
6263
# initial rootfs size override. dietpi-imager will shrink it as much as possible, but the larger the initial rootfs size, the larger the resulting image.
6364
# See "root_size" below for per-SBC defaults, which may not work with all combinations of options, and are updated regularly.
6465
ROOT_SIZE=
@@ -82,6 +83,7 @@ do
8283
'--test-kernel') TEST_KERNEL=1;;
8384
'--test-uboot') TEST_UBOOT=1;;
8485
'--root-size') shift; ROOT_SIZE=$1;;
86+
'--rk35xx-mainline') RK35XX_MAINLINE=1;;
8587
*) Error_Exit "Invalid input \"$1\"";;
8688
esac
8789
shift
@@ -208,11 +210,11 @@ case $PTTYPE in
208210
esac
209211

210212
# Check for valid root filesystem type and set variables accordingly
211-
fsname='' afspackages=() afs_opts=() afsck=() aresize=()
213+
fsname='' afspackages=() afs_opts=() afsck=() aresize=() apackages=()
212214
case $FSTYPE in
213-
'ext4') afspackages+=('e2fsprogs') afs_opts=('-e' 'remount-ro') afsck=('e2fsck' '-fyD') aresize=('resize2fs');;
214-
'f2fs') fsname='F2FS' afspackages+=('f2fs-tools') afsck=('fsck.f2fs' '-f') aresize=('resize.f2fs'); uname -r | grep -q '-azure$' && apackages+=('linux-modules-extra-azure');;
215-
'btrfs') fsname='Btrfs' afspackages+=('btrfs-progs') afsck=('btrfs' 'check' '--repair') aresize=('btrfs' 'filesystem' 'resize' 'max'); ((root_size+=128));;
215+
'ext4') afspackages+=('e2fsprogs') afs_opts=('-e' 'remount-ro' '-O' '^has_journal') afsck=('e2fsck' '-fyD') aresize=('resize2fs');;
216+
'f2fs') fsname='F2FS' afspackages+=('f2fs-tools') afsck=('fsck.f2fs' '-f') aresize=('resize.f2fs'); uname -r | grep -q '-azure$' && apackages+=("linux-modules-extra-$(uname -r)");;
217+
'btrfs') fsname='Btrfs' afspackages+=('btrfs-progs') afsck=('btrfs' 'check' '--repair') aresize=('btrfs' 'filesystem' 'resize' 'max'); ((root_size*=5,root_size/=4));;
216218
*) Error_Exit "Invalid root filesystem type \"$FSTYPE\" passed";;
217219
esac
218220

@@ -225,6 +227,7 @@ G_CHECK_URL "https://github.com/$GITOWNER/DietPi/tree/$GITBRANCH" || Error_Exit
225227

226228
# Generate image name and define CLONING_TOOL for dietpi-installer
227229
OUTPUT_IMG_NAME="DietPi_$iname-$iarch-${distro^}"
230+
[[ $RK35XX_MAINLINE == 1 && $HW_MODEL =~ ^(78|79'.'[1-3]|80|82|85|90|91|92|93|94|95)$ ]] && OUTPUT_IMG_NAME+='_mainline'
228231
[[ $fsname ]] && OUTPUT_IMG_NAME+="_$fsname"
229232
CLONING_TOOL='dd'
230233
if [[ $VARIANT == 'iso' ]]
@@ -242,7 +245,7 @@ fi
242245
(( $efi_size )) || [[ $boot_size -gt 0 && $boot_fstype == 'fat'* ]] && afspackages+=('dosfstools')
243246

244247
# Emulation support in case of incompatible architecture
245-
emulation=0 apackages=("${afspackages[@]}")
248+
emulation=0 apackages+=("${afspackages[@]}")
246249
(( $G_HW_ARCH == $HW_ARCH || ( $G_HW_ARCH < 10 && $G_HW_ARCH > $HW_ARCH ) )) || emulation=1 apackages+=('qemu-user-static')
247250

248251
# Virtual machine disk conversion
@@ -464,7 +467,7 @@ cat << _EOF_ > rootfs/etc/rc.local
464467
#!/bin/dash
465468
{
466469
infocmp "\$TERM" > /dev/null 2>&1 || { echo "[ WARN ] Unsupported TERM=\"\$TERM\", switching to TERM=\"dumb\""; export TERM=dumb; }
467-
export GITOWNER='$GITOWNER' GITBRANCH='$GITBRANCH' HW_MODEL='$HW_MODEL' IMAGE_CREATOR=0 PREIMAGE_INFO=0 WIFI_REQUIRED=1 DISTRO_TARGET=$DISTRO TEST_KERNEL=$TEST_KERNEL TEST_UBOOT=$TEST_UBOOT TMPDIR='/tmp'
470+
export GITOWNER='$GITOWNER' GITBRANCH='$GITBRANCH' HW_MODEL='$HW_MODEL' IMAGE_CREATOR=0 PREIMAGE_INFO=0 WIFI_REQUIRED=1 DISTRO_TARGET=$DISTRO TEST_KERNEL=$TEST_KERNEL TEST_UBOOT=$TEST_UBOOT RK35XX_MAINLINE=$RK35XX_MAINLINE TMPDIR='/tmp'
468471
echo '[ INFO ] Running DietPi-Installer for $G_GITOWNER/$G_GITBRANCH'
469472
bash -c "\$(curl -sSf 'https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.build/images/dietpi-installer')" || { echo '[FAILED] DietPi-Installer failed, shutting down ...'; journalctl -n 25; df -h; free -h; systemctl start poweroff.target; exit 1; }
470473
> /success
@@ -515,19 +518,19 @@ IMAGER_ARGS=("$OUTPUT_IMG_NAME.img")
515518
(( $SKIP_ARCHIVE )) && IMAGER_ARGS+=('--skip-archive')
516519
[[ $UPLOAD_SCRIPT ]] && IMAGER_ARGS+=('--upload-script' "$UPLOAD_SCRIPT")
517520
(( $ADD_DOS_PART )) && IMAGER_ARGS+=('--add-dos-part')
518-
[[ $HW_MODEL == [1245] ]] && IMAGER_ARGS+=('--configs-to-boot')
521+
(( $HW_MODEL < 10 && $G_DISTRO > 6 )) && IMAGER_ARGS+=('--configs-to-boot')
519522
[[ $SIGN_PASS ]] && IMAGER_ARGS+=('--sign' "$SIGN_PASS")
520-
# Raspberry Pi Imager info
521-
[[ $HW_MODEL == [1-5] && $DISTRO == 7 || $DISTRO == 8 ]] && IMAGER_ARGS+=('--raw-hash-size')
522523

523524
####### IMG/ISO ##########################
524525
if [[ ! $EDITION || $EDITION == 'all' ]]
525526
then
526527
[[ $VARIANT == 'iso' ]] && ext='iso' || ext='img'
528+
# Raspberry Pi Imager info
529+
[[ $HW_MODEL == [1-5] && $DISTRO == 8 && $OUTPUT_IMG_NAME == *'-Trixie' ]] && IMAGER_ARGS+=('--raw-hash-size')
527530
G_DIETPI-NOTIFY 2 "Running DietPi-Imager from $G_GITOWNER/$G_GITBRANCH to generate $OUTPUT_IMG_NAME.$ext"
528531
bash -c "$(curl -sSf "https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.build/images/dietpi-imager")" 'DietPi-Imager' "${IMAGER_ARGS[@]}" || exit 1
529532
# Raspberry Pi Imager info: add for standard image only
530-
[[ $HW_MODEL == [1-5] && $DISTRO == 8 ]] && unset 'IMAGER_ARGS[-1]'
533+
[[ ${IMAGER_ARGS[-1]} == '--raw-hash-size' ]] && unset 'IMAGER_ARGS[-1]'
531534
fi
532535

533536
####### ALL/ISO ##########################
@@ -541,7 +544,7 @@ fi
541544

542545
####### Amiberry #########################
543546
# - Install automatically on first boot, enable autostart option and onboard audio on RPi
544-
if [[ $EDITION == 'Amiberry' || ( $EDITION == 'all' && $HW_MODEL =~ ^(1|2|4|5)$ ) ]]
547+
if [[ $EDITION == 'Amiberry' || ( $EDITION == 'all' && $HW_MODEL == [1-5] ) ]]
545548
then
546549
G_EXEC mv "$OUTPUT_IMG_NAME.img" "${OUTPUT_IMG_NAME}_Amiberry.img"
547550
OUTPUT_IMG_NAME="${OUTPUT_IMG_NAME}_Amiberry"
@@ -562,9 +565,10 @@ then
562565

563566
# Mount filesystems
564567
G_EXEC mkdir rootfs
565-
if [[ $HW_MODEL == [1245] ]]
568+
if (( $HW_MODEL < 10 && $G_DISTRO > 6 ))
566569
then
567570
G_EXEC mount "${FP_LOOP}p2" rootfs
571+
G_EXEC mount "${FP_LOOP}p1" rootfs/boot/firmware
568572

569573
elif (( $boot_size ))
570574
then
@@ -594,8 +598,7 @@ fi
594598

595599
####### AlloGUI ##########################
596600
# - Pre-install Allo GUI with all managed audiophile software
597-
# - Temporarily skip Trixie AlloGUI builds: The netdata package is currently not available (only on Raspbian, not Debian) and systemd-logind fails to start within the container as of a new change/bug, to investigate.
598-
if [[ $EDITION == 'AlloGUI' || ( $EDITION == 'all' && $HW_MODEL =~ ^(1|2|4|5|70)$ && $DISTRO != 8 ) ]]
601+
if [[ $EDITION == 'AlloGUI' || ( $EDITION == 'all' && $HW_MODEL =~ ^([1-5]|70)$ ) ]]
599602
then
600603
G_EXEC mv "$OUTPUT_IMG_NAME.img" "${OUTPUT_IMG_NAME%_Amiberry}_AlloGUI.img"
601604
OUTPUT_IMG_NAME="${OUTPUT_IMG_NAME%_Amiberry}_AlloGUI"
@@ -624,7 +627,7 @@ then
624627

625628
# Mount filesystems
626629
G_EXEC mkdir rootfs
627-
if [[ $HW_MODEL == [1245] ]]
630+
if (( $HW_MODEL < 10 && $G_DISTRO > 6 ))
628631
then
629632
G_EXEC mount "${FP_LOOP}p2" rootfs
630633
G_EXEC mount "${FP_LOOP}p1" rootfs/boot/firmware
@@ -712,10 +715,10 @@ G_EXEC rm -Rf /{root,home/*}/.{bash_history,nano_history,wget-hsts,cache,local,c
712715
G_EXEC rm -f /mnt/dietpi_userdata/roon/{RoonBridge,RAATServer}/Settings/unique_id
713716
714717
# Re-create required log dirs
715-
G_EXEC mkdir -pm 2750 /var/tmp/dietpi/logs/dietpi-ramlog_store/{mysql,netdata,samba}
718+
G_EXEC mkdir -pm 2750 /var/tmp/dietpi/logs/dietpi-ramlog_store/{mysql,samba}
716719
G_EXEC chown mysql /var/tmp/dietpi/logs/dietpi-ramlog_store/mysql
717-
G_EXEC chown netdata /var/tmp/dietpi/logs/dietpi-ramlog_store/netdata
718720
G_EXEC chmod 0750 /var/tmp/dietpi/logs/dietpi-ramlog_store/samba
721+
(( $G_DISTRO < 8 )) && G_EXEC mkdir -m 2750 /var/tmp/dietpi/logs/dietpi-ramlog_store/netdata && G_EXEC chown netdata /var/tmp/dietpi/logs/dietpi-ramlog_store/netdata
719722
720723
# Remove automation scripts and workarounds
721724
G_EXEC rm /etc/bashrc.d/00-dietpi-build.sh /boot/Automation_Custom_Script.sh

‎.build/images/dietpi-imager‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,17 @@
397397
# - resize2fs: "Please run 'e2fsck -f /dev/loop0p1' first."
398398
Run_fsck
399399
# - 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
400-
local last_part_dev=$(sfdisk -qlo Device "$FP_SOURCE" | tail -1)
400+
local last_part_dev=$(sfdisk -lqo Device "$FP_SOURCE" | tail -1)
401401
local last_fs_type=$(lsblk -no FSTYPE "$last_part_dev")
402-
if [[ $last_fs_type == 'ext4' ]]
402+
if [[ $last_fs_type == 'ext'[234] ]]
403403
then
404-
# Disable (and later re-enable) journal to clear it and allow further size reduction
405-
G_EXEC tune2fs -O '^has_journal' "$last_part_dev"
406-
G_EXEC sync
407-
G_SLEEP 1
404+
if [[ $last_fs_type == 'ext'[34] ]]
405+
then
406+
# Disable journal to allow further image size reduction and allow dietpi-fs_partition_resize to re-create it with proper size based final filesystem size
407+
G_EXEC tune2fs -O '^has_journal' "$last_part_dev"
408+
G_EXEC sync
409+
G_SLEEP 1
410+
fi
408411

409412
# Run multiple times until no change is done any more
410413
G_DIETPI-NOTIFY 2 'Shrinking last filesystem to minimum size...'
@@ -487,32 +490,8 @@
487490
[[ $type ]] || continue
488491
if [[ $type == 'ext'[234] ]]
489492
then
490-
# Disable (and later re-enable) journal on ext3 and ext4 to clear it if not last partition (where it was done already)
491-
if [[ $type != 'ext2' && $path != "$last_part_dev" ]]
492-
then
493-
G_EXEC tune2fs -O '^has_journal' "$path"
494-
G_EXEC sync
495-
G_SLEEP 1
496-
fi
497493
[[ ( -t 0 || -t 1 ) && $TERM != 'dumb' ]] && G_EXEC_OUTPUT=1
498494
G_EXEC zerofree -v "$path"
499-
local redo=0 out
500-
until out=$(tune2fs -O 'has_journal' "$path" 2>&1)
501-
do
502-
[[ $out =~ 'tune2fs: Could not allocate block' ]] || Error_Exit "$out"
503-
G_DIETPI-NOTIFY 2 'Raising filesystem size by 4 MiB until the journal fits'
504-
((FS_SIZE+=8192))
505-
G_EXEC resize2fs "$last_part_dev" "${FS_SIZE}s"
506-
redo=1
507-
done
508-
G_DIETPI-NOTIFY 0 "tune2fs -O has_journal $path"
509-
G_EXEC sync
510-
G_SLEEP 1
511-
if (( $redo ))
512-
then
513-
[[ ( -t 0 || -t 1 ) && $TERM != 'dumb' ]] && G_EXEC_OUTPUT=1
514-
G_EXEC zerofree -v "$path"
515-
fi
516495
else
517496
G_EXEC mount "$path" "$FP_MNT_TMP"
518497
G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 G_EXEC fstrim -v --quiet-unsupported "$FP_MNT_TMP"
@@ -556,7 +535,7 @@
556535
local root_mountpoint=$(mktemp -d)
557536
G_EXEC mount "${FP_ROOT_DEV::-1}1" "$fat_mountpoint"
558537
G_EXEC mount "$FP_ROOT_DEV" "$root_mountpoint"
559-
G_DIETPI-NOTIFY 2 'Copying dietpi.txt and other config files to the DIETPISETUP partition'
538+
G_DIETPI-NOTIFY 2 'Copying dietpi.txt and other config files to the boot partition'
560539
for f in 'dietpi.txt' 'dietpi-wifi.txt' 'Automation_Custom_PreScript.sh' 'Automation_Custom_Script.sh' 'unattended_pivpn.conf'
561540
do
562541
[[ -f $root_mountpoint/boot/$f ]] || continue

‎.build/images/dietpi-installer‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
# - PREIMAGE_INFO='Some GNU/Linux'
2424
# - HW_MODEL=0 (must match one of the supported IDs below)
2525
# - WIFI_REQUIRED=0 [01]
26-
# - DISTRO_TARGET=7 [6789] (Bullseye: 6, Bookworm: 7, Trixie: 8, Forky: 9)
26+
# - DISTRO_TARGET=8 [6789] (Bullseye: 6, Bookworm: 7, Trixie: 8, Forky: 9)
2727
# - TEST_KERNEL=1 Install test kernel from https://dietpi.com/downloads/binaries/testing/
2828
# - TEST_UBOOT=1 Install test U-Boot from https://dietpi.com/downloads/binaries/testing/
29+
# - RK35XX_MAINLINE=1 Install mainline kernel on RK35xx based SBCs we would otherwise install the vendor kernel
2930
#------------------------------------------------------------------------------------------------
3031

3132
# Core globals
@@ -34,6 +35,7 @@
3435
# Input variables
3536
[[ $TEST_KERNEL == 1 ]] || TEST_KERNEL=0
3637
[[ $TEST_UBOOT == 1 ]] || TEST_UBOOT=0
38+
[[ $RK35XX_MAINLINE == 1 ]] || RK35XX_MAINLINE=0
3739

3840
#------------------------------------------------------------------------------------------------
3941
# Critical checks and requirements to run this script
@@ -521,7 +523,7 @@ _EOF_
521523
G_DIETPI-NOTIFY 2 "Selected hardware model ID: $G_HW_MODEL"
522524

523525
# Check for partition table: https://github.com/MichaIng/DietPi/issues/5691
524-
local BOOT_DEVICE=$(lsblk -npo PKNAME "$(findmnt -Ufnro SOURCE -T /boot)")
526+
local BOOT_DEVICE=$(lsblk -npo PKNAME "$(findmnt -Ufvnro SOURCE -T /boot)")
525527
# - Ignore for containers
526528
if [[ ! $BOOT_DEVICE && $G_HW_MODEL != 75 ]]
527529
then
@@ -777,10 +779,11 @@ setenv rootuuid "true"' /boot/boot.cmd
777779
*) :;;
778780
esac
779781
# Console args
782+
# shellcheck disable=SC2015
780783
case $G_HW_MODEL in
781784
73) G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS0,1500000' /boot/dietpiEnv.txt;; # headless
782785
47|55|56) G_CONFIG_INJECT 'consoleargs=' 'consoleargs=console=ttyS2,1500000' /boot/dietpiEnv.txt;; # headless
783-
78|79|80|82|85|90|91|92|93|94|95) G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyFIQ0,1500000/' /boot/dietpiEnv.txt;; # vendor
786+
78|79|80|82|85|90|91|92|93|94|95) [[ $RK35XX_MAINLINE == 1 ]] && G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyS2,1500000/' /boot/dietpiEnv.txt || G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyFIQ0,1500000/' /boot/dietpiEnv.txt;; # mainline or vendor
784787
*) G_EXEC sed --follow-symlinks -i 's/ttyAML0,115200/ttyS2,1500000/' /boot/dietpiEnv.txt;; # mainline
785788
esac
786789

@@ -850,7 +853,7 @@ setenv rootuuid "true"' /boot/boot.cmd
850853
# Overlays
851854
case $G_HW_MODEL in
852855
48) G_CONFIG_INJECT 'overlays=' 'overlays=usbhost1 usbhost2 uart1' /boot/dietpiEnv.txt;;
853-
59|60) G_CONFIG_INJECT 'overlays=' 'overlays=usbhost1 usbhost2' /boot/dietpiEnv.txt;;
856+
60) G_CONFIG_INJECT 'overlays=' 'overlays=usbhost1 usbhost2' /boot/dietpiEnv.txt;;
854857
64) G_CONFIG_INJECT 'overlays=' 'overlays=usbhost2 usbhost3' /boot/dietpiEnv.txt;;
855858
*) :;;
856859
esac
@@ -1007,8 +1010,8 @@ _EOF_'
10071010
)
10081011

10091012
# Install gdisk if root filesystem is on a GPT partition, used by DietPi-FS_partition_resize
1010-
local ROOT_DEVICE=$(findmnt -Ufnro SOURCE -M /)
1011-
[[ $(blkid -s PTTYPE -o value -c /dev/null "$(lsblk -npo PKNAME "$ROOT_DEVICE")") == 'gpt' ]] && aPACKAGES_REQUIRED_INSTALL+=('gdisk')
1013+
local ROOT_DEVICE=$(findmnt -Ufvnro SOURCE -M /)
1014+
[[ $(blkid -s PTTYPE -o value "$(lsblk -npo PKNAME "$ROOT_DEVICE")") == 'gpt' ]] && aPACKAGES_REQUIRED_INSTALL+=('gdisk')
10121015

10131016
# Install mdadm if root filesystem is on a RAID
10141017
[[ $(lsblk -no TYPE "$ROOT_DEVICE") == 'raid'* ]] && aPACKAGES_REQUIRED_INSTALL+=('mdadm')
@@ -1035,16 +1038,16 @@ _EOF_'
10351038
aPACKAGES_REQUIRED_INSTALL+=('btrfs-progs')
10361039
fi
10371040

1038-
done < <(blkid -s TYPE -o value -c /dev/null | sort -u)
1041+
done < <(blkid -s TYPE -o value | sort -u)
10391042

10401043
# Containers
10411044
if (( $G_HW_MODEL == 75 ))
10421045
then
10431046
aPACKAGES_REQUIRED_INSTALL+=('iproute2')
10441047
(( $G_RASPBIAN == 1 )) && aPACKAGES_REQUIRED_INSTALL+=('raspberrypi-archive-keyring')
10451048

1046-
# Move Raspbian key to active place and remove obsolete combined keyring
1047-
[[ -f '/usr/share/keyrings/raspbian-archive-keyring.gpg' ]] && G_EXEC ln -sf /usr/share/keyrings/raspbian-archive-keyring.gpg /etc/apt/trusted.gpg.d/raspbian-archive-keyring.gpg
1049+
# Move Raspbian key to active place (until Trixie) and remove obsolete combined keyring
1050+
(( $G_DISTRO < 8 )) && [[ -f '/usr/share/keyrings/raspbian-archive-keyring.gpg' ]] && G_EXEC ln -sf /usr/share/keyrings/raspbian-archive-keyring.gpg /etc/apt/trusted.gpg.d/raspbian-archive-keyring.gpg
10481051
[[ -f '/etc/apt/trusted.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg
10491052
[[ -f '/etc/apt/trusted.gpg~' ]] && G_EXEC rm '/etc/apt/trusted.gpg~'
10501053
else
@@ -1224,6 +1227,9 @@ _EOF_
12241227
*) :;;
12251228
esac
12261229

1230+
# Override with mainline kernel if wanted
1231+
[[ $RK35XX_MAINLINE == 1 && $kernel == 'rk35xx' ]] && kernel='rockchip64' branch='edge'
1232+
12271233
# NanoPi R2S/NEO3
12281234
if [[ $G_HW_MODEL =~ ^(55|56)$ ]]
12291235
then
@@ -1412,8 +1418,8 @@ _EOF_
14121418
[[ -f '/etc/apt/trusted.gpg.d/microsoft.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg.d/microsoft.gpg
14131419
[[ -f '/etc/apt/sources.list.d/vscode.list' ]] && G_EXEC rm /etc/apt/sources.list.d/vscode.list
14141420

1415-
# Move Raspbian key to active place and remove obsolete combined keyring
1416-
[[ -f '/usr/share/keyrings/raspbian-archive-keyring.gpg' ]] && G_EXEC ln -sf /usr/share/keyrings/raspbian-archive-keyring.gpg /etc/apt/trusted.gpg.d/raspbian-archive-keyring.gpg
1421+
# Move Raspbian key to active place (until Trixie) and remove obsolete combined keyring
1422+
(( $G_DISTRO < 8 )) && [[ -f '/usr/share/keyrings/raspbian-archive-keyring.gpg' ]] && G_EXEC ln -sf /usr/share/keyrings/raspbian-archive-keyring.gpg /etc/apt/trusted.gpg.d/raspbian-archive-keyring.gpg
14171423
[[ -f '/etc/apt/trusted.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg
14181424
[[ -f '/etc/apt/trusted.gpg~' ]] && G_EXEC rm '/etc/apt/trusted.gpg~'
14191425

@@ -2110,8 +2116,8 @@ _EOF_'
21102116
then
21112117
/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS0
21122118

2113-
# Rockchip mainline
2114-
elif [[ $kernel == 'rockchip' || $kernel == 'rockchip64' ]]
2119+
# Rockchip mainline, Quartz64
2120+
elif [[ $kernel == 'rockchip' || $kernel == 'rockchip64' || $G_HW_MODEL == 49 ]]
21152121
then
21162122
/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS2
21172123

0 commit comments

Comments
 (0)