Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-28 03:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt to get images building.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2024-09-10 12:28:10 +02:00
parent ed89ea74c8
commit 66d8622dc0
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -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@ubuntu.com> Tue, 10 Sep 2024 12:25:44 +0200
livecd-rootfs (2.765.48) jammy; urgency=medium livecd-rootfs (2.765.48) jammy; urgency=medium
[ Łukasz 'sil2100' Zemczak ] [ Łukasz 'sil2100' Zemczak ]

18
live-build/auto/config
View File

@ -825,9 +825,9 @@ case $PROJECT in
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography 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 # 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) # Fixes build failure (LP: #2079803)
# We need to do it by hand as we can't use remove_package here # We need to do it in a very hacky way, as the package-list files contain shell lines to execute to extract the needed
sed -i '/v4l2loopback-utils/d' config/package-lists/livecd-rootfs.list.chroot_install # packages. So to filter out the unneeded packages we hack in a sed filter for the respective task.
sed -i '/v4l2loopback-dkms/d' config/package-lists/livecd-rootfs.list.chroot_install sed -i '/ubuntustudio-video/s/$/ | sed "\/^v4l2loopback-\/d" /' config/package-lists/livecd-rootfs.list.chroot_install
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS='lowlatency-hwe-22.04' ;; amd64|i386) KERNEL_FLAVOURS='lowlatency-hwe-22.04' ;;
@ -1353,18 +1353,6 @@ exit 0
EOF EOF
fi 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 if $BINARY_REMOVE_LINUX; then
cat > config/binary_rootfs/excludes << EOF cat > config/binary_rootfs/excludes << EOF
boot/vmlinu?-* boot/vmlinu?-*