v8.23

- DietP-Pre-patches | Apply RISC-V patch on RISC-V platforms only
MichaIng · Sep 28, 2023 · 970abad · 970abad
1 parent c1d9640
commit 970abad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.update/pre-patches b/.update/pre-patches
@@ -312,9 +312,12 @@ fi
 if (( $G_DIETPI_VERSION_CORE < 8 || ( $G_DIETPI_VERSION_CORE == 8 && $G_DIETPI_VERSION_SUB < 22 ) ))
 then
 	# RISC-V: Migrate from Debian ports to regular Debian Sid
-	G_DIETPI-NOTIFY 2 'Migrating from Debian ports to regular Debian Sid repository, which now supports RISC-V'
-	G_EXEC eval 'echo '\''deb https://deb.debian.org/debian/ sid main contrib non-free non-free-firmware'\'' > /etc/apt/sources.list'
-	dpkg-query -s 'debian-ports-archive-keyring' &> /dev/null && G_EXEC apt-mark auto debian-ports-archive-keyring
+	if (( $G_HW_ARCH == 11 ))
+	then
+		G_DIETPI-NOTIFY 2 'Migrating from Debian ports to regular Debian Sid repository, which now supports RISC-V'
+		G_EXEC eval 'echo '\''deb https://deb.debian.org/debian/ sid main contrib non-free non-free-firmware'\'' > /etc/apt/sources.list'
+		dpkg-query -s 'debian-ports-archive-keyring' &> /dev/null && G_EXEC apt-mark auto debian-ports-archive-keyring
+	fi
 fi
 
 exit 0

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -9252,11 +9252,11 @@ _EOF_
 
 		if To_Install 136 motioneye # motionEye
 		then
-			# APT deps
-			# - ARMv6/7 Bookworm + RISC-V: libcurl4-openssl-dev gcc libssl-dev for pycurl, libjpeg-dev for Pillow
+			# APT deps: libcurl4-openssl-dev gcc libssl-dev for pycurl
+			# - ARMv6/7 Bookworm + RISC-V: libjpeg-dev for Pillow
 			if (( ( $G_HW_ARCH < 3 && $G_DISTRO > 6 ) || $G_HW_ARCH == 11 ))
 			then
-				G_AGI libcurl4-openssl-dev gcc libssl-dev libjpeg-dev
+				G_AGI libjpeg-dev
 
 			# - ARMv8/x86_64
 			elif (( $G_HW_ARCH > 2 ))