v8.24

- CI | DietPi-Software: Apply RPi Trixie FFmpeg workaround when enforcing RPi repo test
MichaIng · Oct 30, 2023 · 781c758 · 781c758
1 parent 02afdd2
commit 781c758
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/dietpi-software.bash b/.github/workflows/dietpi-software.bash
@@ -298,6 +298,12 @@ then
 	G_EXEC curl -sSf 'https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-archive-keyring/raspberrypi-archive-keyring_2021.1.1+rpt1_all.deb' -o keyring.deb
 	G_EXEC dpkg --root=rootfs -i keyring.deb
 	G_EXEC rm keyring.deb
+	# Enforce Debian Trixie FFmpeg packages over RPi repo ones
+	[[ $DISTRO != 'trixie' ]] || cat << '_EOF_' > rootfs/etc/apt/preferences.d/dietpi-ffmpeg || exit 1
+Package: src:ffmpeg
+Pin: origin archive.raspberrypi.org
+Pin-Priority: -1
+_EOF_
 fi
 
 # Workaround invalid TERM on login