[neon/neon/livecd-rootfs/Neon/release_jammy] /: Another attempt to get images building.

[Łukasz 'sil2100' Zemczak]

Git commit 66d8622dc033b200bc23169c997bf7934dcda9a9 by Łukasz 'sil2100' Zemczak.
Committed on 10/09/2024 at 10:28.
Pushed by jriddell into branch 'Neon/release_jammy'.

Another attempt to get images building.

M  +9    -0    debian/changelog
M  +3    -15   live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/66d8622dc033b200bc23169c997bf7934dcda9a9

diff --git a/debian/changelog b/debian/changelog
index 7bca031f..55b3ab29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.765.49) UNRELEASED; urgency=medium
+
+  * The package-lists for tasks are shell lines, so to remove the unwanted
+    packages, we need to be a bit more creative.
+  * Remove the late hook that was removing v4l2loopback packages - as those
+    are no longer installed in the first place.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Tue, 10 Sep 2024 12:25:44 +0200
+
 livecd-rootfs (2.765.48) jammy; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 3f7b9ffc..06a1f67e 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -825,9 +825,9 @@ case $PROJECT in
 		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
 		# To work around the fact that v4l2loopback-dkms is still pulled in (via tasks) even though no longer present in the seeds
 		# Fixes build failure (LP: #2079803)
-		# We need to do it by hand as we can't use remove_package here
-		sed -i '/v4l2loopback-utils/d' config/package-lists/livecd-rootfs.list.chroot_install
-		sed -i '/v4l2loopback-dkms/d' config/package-lists/livecd-rootfs.list.chroot_install
+		# We need to do it in a very hacky way, as the package-list files contain shell lines to execute to extract the needed
+		# packages. So to filter out the unneeded packages we hack in a sed filter for the respective task.
+		sed -i '/ubuntustudio-video/s/$/ | sed "\/^v4l2loopback-\/d" /' config/package-lists/livecd-rootfs.list.chroot_install
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
 			amd64|i386)	KERNEL_FLAVOURS='lowlatency-hwe-22.04' ;;
@@ -1353,18 +1353,6 @@ 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
-	chmod +x config/hooks/100-ubuntustudio-dkms.chroot
-fi
-
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF
 boot/vmlinu?-*