From 573cde58cd035126e624582976cc9ed55c69a747 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 5 Dec 2023 21:18:13 -0800 Subject: [PATCH] Remove *-dvd glob handling for live layers; Ubuntu Studio is the only remaining "DVD" flavor, and with the move to the new installer this bit is also now incorrect. --- debian/changelog | 5 +++++ live-build/auto/config | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1f957cd..5707afe1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ livecd-rootfs (24.04.8) UNRELEASED; urgency=medium [ Erich Eickmeyer ] * Switch Ubuntu Studio to the new installer. + [ Steve Langasek ] + * Remove *-dvd glob handling for live layers; Ubuntu Studio is the only + remaining "DVD" flavor, and with the move to the new installer this bit + is also now incorrect. + -- Steve Langasek Tue, 05 Dec 2023 21:12:26 -0800 livecd-rootfs (24.04.7) noble; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index cd981ef8..c99ee667 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1145,12 +1145,6 @@ if [ "$PREINSTALLED" != "true" ] && [ "$PASSES_TO_LAYERS" != "true" ] && [ "$LIV add_task live "$LIVE_TASK" fi -case $PROJECT in - *-dvd) - add_task live "$PROJECT-live" - ;; -esac - case "$ARCH${SUBARCH:++$SUBARCH}" in arm*+raspi) # Common configuration for all Raspberry Pi image variants (server,