Beta v8.10.0 (#5805)

MichaIng · Oct 15, 2022 · afaff4f · afaff4f
2 parents 8918f87 + 1fb1077
commit afaff4f
Show file tree

Hide file tree

Showing 23 changed files with 1,438 additions and 135 deletions.
diff --git a/.build/images/dietpi-build b/.build/images/dietpi-build
@@ -113,7 +113,15 @@ exclude=
 case $DISTRO in
 	5) distro='buster'; [[ $HW_MODEL == 75 ]] || { G_DIETPI-NOTIFY 1 "Invalid distro \"$DISTRO\" passed, aborting..."; exit 1; };;
 	6) distro='bullseye' exclude=',gcc-8-base,gcc-9-base';;
-	7) distro='bookworm' exclude=',gcc-8-base,gcc-9-base,gcc-10-base,gcc-11-base'; [[ $HW_MODEL == 21 ]] && ((root_size+=384));; # Raise root size where required
+	7)
+		distro='bookworm' exclude=',gcc-8-base,gcc-9-base,gcc-10-base,gcc-11-base'
+		# Raise root size where required
+		case $HW_MODEL in
+			1[256]|7[45]) ((root_size+=128));;
+			21) ((root_size+=384));;
+			*) :;;
+		esac
+	;; 
 	*) G_DIETPI-NOTIFY 1 "Invalid distro \"$DISTRO\" passed, aborting..."; exit 1;;
 esac
 
@@ -408,6 +416,9 @@ then
 	# Revert autostart option, in case Amiberry image was generated before
 	G_CONFIG_INJECT 'AUTO_SETUP_AUTOSTART_TARGET_INDEX=' 'AUTO_SETUP_AUTOSTART_TARGET_INDEX=0' rootfs/boot/dietpi.txt
 
+	# Force ARMv6 arch on Raspbian
+	(( $HW_ARCH == 1 )) && echo 'sed -i -e '\''/^G_HW_ARCH=/c\G_HW_ARCH=1'\'' -e '\''/^G_HW_ARCH_NAME=/c\G_HW_ARCH_NAME=armv6l'\'' /boot/dietpi/.hw_model' > rootfs/boot/Automation_Custom_PreScript.sh
+
 	# Workaround invalid TERM on login
 	# shellcheck disable=SC2016
 	G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
@@ -467,6 +478,8 @@ G_EXEC rm /etc/bashrc.d/00-dietpi-build.sh /boot/Automation_Custom_Script.sh /ro
 poweroff
 }
 _EOF_
+	(( $HW_ARCH == 1 )) && G_EXEC sed -i '/Automation_Custom_Script/i\G_EXEC rm /boot/Automation_Custom_PreScript.sh' rootfs/boot/Automation_Custom_Script.sh
+
 	# Start container
 	# - dbus required for container spawn
 	mask_dbus=0

diff --git a/.build/images/dietpi-installer b/.build/images/dietpi-installer
@@ -810,10 +810,8 @@ _EOF_
 			# Remove obsolete combined keyring
 			[[ -f '/etc/apt/trusted.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg
 			[[ -f '/etc/apt/trusted.gpg~' ]] && G_EXEC rm '/etc/apt/trusted.gpg~'
-			# Exclude doubled device tree files, shipped with the kernel package
-			G_EXEC eval "echo 'path-exclude /usr/lib/linux-image-current-*' > /etc/dpkg/dpkg.cfg.d/01-dietpi-exclude_doubled_devicetrees"
-			# Remove obsolete lists and doubled device tree files, shipped with the kernel package
-			G_EXEC rm -Rf /etc/apt/sources.list.d/* /usr/lib/linux-image-current-*
+			# Remove obsolete lists
+			G_EXEC rm -Rf /etc/apt/sources.list.d/*
 			# Add Armbian repository
 			G_EXEC eval "echo 'deb http://apt.armbian.com/ ${DISTRO_TARGET_NAME/bookworm/bullseye} main' > /etc/apt/sources.list.d/dietpi-armbian.list"
 			# Update APT lists
@@ -1141,7 +1139,7 @@ _EOF_
 		getent group openmediavault-webgui > /dev/null && groupdel openmediavault-webgui # OMV (NanoPi NEO2)
 
 		G_DIETPI-NOTIFY 2 'Resetting root user account'
-		G_EXEC usermod -d /root -s /bin/dash root
+		G_EXEC usermod -d /root -s /bin/bash root
 		G_EXEC eval 'chpasswd <<< '\''root:dietpi'\'
 
 		G_EXEC_DESC='Creating DietPi user account' G_EXEC /boot/dietpi/func/dietpi-set_software useradd dietpi
@@ -1366,7 +1364,9 @@ _EOF_'
 
 		G_DIETPI-NOTIFY 2 'Configuring DNS nameserver:'
 		# Failsafe: Assure that /etc/resolv.conf is not a symlink and disable systemd-resolved + systemd-networkd
-		G_EXEC systemctl disable --now systemd-{resolve,network}d
+		# - Since Bookworm, systemd-resolved is now an own package.
+		G_EXEC systemctl disable --now systemd-networkd
+		(( $G_DISTRO > 6 )) || G_EXEC systemctl disable --now systemd-resolved
 		G_EXEC rm -f /etc/resolv.conf
 		echo 'nameserver 9.9.9.9' > /etc/resolv.conf # Apply generic functional DNS nameserver, updated on next service start
 
@@ -1525,8 +1525,8 @@ _EOF_'
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyAMA0
 
-		# ROCK Pi 4 and Quartz64
-		elif (( $G_HW_MODEL == 72 || $G_HW_MODEL == 49 ))
+		# ROCK Pi 4, ROCKPro64, NanoPi R4S and Quartz64
+		elif [[ $G_HW_MODEL =~ ^(72|4[279])$ ]]
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS2
 

diff --git a/.build/software/Amiberry/build.bash b/.build/software/Amiberry/build.bash
@@ -23,7 +23,7 @@ G_AGDUG
 G_AG_CHECK_INSTALL_PREREQ "${adeps_build[@]}"
 
 # Build libSDL2
-v_sdl='2.0.22'
+v_sdl='2.24.1'
 if [[ ! -d /tmp/SDL2-$v_sdl ]]
 then
 	G_DIETPI-NOTIFY 2 "Building libSDL2 version \e[33m$v_sdl"
@@ -97,7 +97,7 @@ else
 fi
 
 # Build Amiberry
-v_ami='5.3'
+v_ami='5.4'
 G_DIETPI-NOTIFY 2 "Building Amiberry version \e[33m$v_ami\e[90m for platform: \e[33m$PLATFORM"
 [[ -d /tmp/amiberry-$v_ami ]] && G_EXEC rm -R "/tmp/amiberry-$v_ami"
 G_EXEC cd /tmp
@@ -186,7 +186,7 @@ grep -q 'raspbian' /etc/os-release && DEPS_APT_VERSIONED=$(sed 's/+rp[it][0-9]\+
 # - control
 cat << _EOF_ > "$DIR/DEBIAN/control"
 Package: amiberry
-Version: $v_ami-dietpi4
+Version: $v_ami-dietpi1
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <[email protected]>
 Date: $(date -u '+%a, %d %b %Y %T %z')

diff --git a/.build/software/raspberrypi-sys-mods/build.bash b/.build/software/raspberrypi-sys-mods/build.bash
@@ -1,5 +1,14 @@
+#!/bin/bash
 {
-. /boot/dietpi/func/dietpi-globals || exit 1
+if [[ -f '/boot/dietpi/func/dietpi-globals' ]]
+then
+	. /boot/dietpi/func/dietpi-globals || exit 1
+else
+	curl -sSf "https://raw.githubusercontent.com/${G_GITOWNER:-MichaIng}/DietPi/${G_GITBRANCH:-master}/dietpi/func/dietpi-globals" -o /tmp/dietpi-globals || exit 1
+	# shellcheck disable=SC1091
+	. /tmp/dietpi-globals || exit 1
+	G_EXEC_NOHALT=1 G_EXEC rm /tmp/dietpi-globals
+fi
 
 G_EXEC mkdir -p raspberrypi-sys-mods/{DEBIAN,lib/udev/rules.d,usr/{lib,share/doc}/raspberrypi-sys-mods}
 
@@ -51,7 +60,7 @@ while :; do
     if grep -q "alias $SUBSYSTEM:$comp " $ALIASES; then
         modprobe "$SUBSYSTEM:$comp" && exit 0
     fi
-    let n="$n + 1"
+    n=$(expr $n + 1)
 done
 modprobe "$MODALIAS" || modprobe "of:N${OF_NAME}T<NULL>C$OF_COMPATIBLE_0"
 _EOF_
@@ -132,7 +141,7 @@ find raspberrypi-sys-mods ! \( -path raspberrypi-sys-mods/DEBIAN -prune \) -type
 
 cat << _EOF_ > raspberrypi-sys-mods/DEBIAN/control
 Package: raspberrypi-sys-mods
-Version: 2:20220915-dietpi1
+Version: 2:20220915-dietpi2
 Architecture: all
 Maintainer: MichaIng <[email protected]>
 Date: $(date -u '+%a, %d %b %Y %T %z')
@@ -149,6 +158,6 @@ G_CONFIG_INJECT 'Installed-Size: ' "Installed-Size: $(du -sk raspberrypi-sys-mod
 
 # Build DEB package
 G_EXEC rm -Rf raspberrypi-sys-mods.deb
-G_EXEC_OUTPUT=1 G_EXEC dpkg-deb -b raspberrypi-sys-mods
+G_EXEC_OUTPUT=1 G_EXEC dpkg-deb -b -Zxz -z9 raspberrypi-sys-mods
 G_EXEC rm -Rf raspberrypi-sys-mods
 }