Merge ~tsimonq2/ubuntu/+source/livecd-rootfs:ubuntu/jammy-proposed into ubuntu/+source/livecd-rootfs:ubuntu/jammy-proposed

[Simon Quigley]

Manually blacklist DKMS modules for Ubuntu Studio builds (LP: #1983521).

[Steve Langasek (vorlon)]

review: Approve

Unmerged commits

a3fa0a9... by Simon Quigley on 2022-08-03

Manually blacklist DKMS modules for Ubuntu Studio builds (LP: #1983521).

diff --git a/debian/changelog b/debian/changelog
index 138a94f..996a5d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.765.8) jammy; urgency=medium
+
+  * Manually blacklist DKMS modules for Ubuntu Studio builds (LP: #1983521).
+
+ -- Simon Quigley <[e-mail]>  Wed, 03 Aug 2022 18:46:23 -0500
+
 livecd-rootfs (2.765.7) jammy; urgency=medium
 
   * Install wpasupplicant by default as for now, most of the RISC-V boards
diff --git a/live-build/auto/config b/live-build/auto/config
index 862bb55..8e594f9 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1297,6 +1297,18 @@ exit 0
 EOF
 fi
 
+if [ "$PROJECT" = "ubuntustudio-dvd" ]; then
+        cat > config/hooks/100-ubuntustudio-dkms.chroot <<EOF
+#!/bin/bash
+set -e
+
+env DEBIAN_FRONTEND=noninteractive \
+       apt-get -y autoremove --purge v4l2loopback-dkms v4l2loopback-utils
+
+EOF
+fi
+chmod +x config/hooks/100-ubuntustudio-dkms.chroot
+
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF
 boot/vmlinu?-*