From 57768281539009be3d67944db5415f87bd7adec3 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 6 Sep 2023 12:04:45 -0700 Subject: [PATCH] Parameterize and consolidate live image definitions for flavors using a common pattern --- debian/changelog | 2 ++ live-build/auto/config | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8cd5ff6..96f7dc8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ livecd-rootfs (23.10.33) UNRELEASED; urgency=medium * live-build/auto/config: various refactors to eliminate code duplication * Drop references to ubuntu-dvd, obsolete after precise. * Drop references to mythbuntu, obsolete after xenial. + * Parameterize and consolidate live image definitions for flavors using + a common pattern -- Steve Langasek Wed, 06 Sep 2023 11:23:17 -0700 diff --git a/live-build/auto/config b/live-build/auto/config index ddd56f5e..b9fb9a34 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -828,9 +828,9 @@ case $PROJECT in esac ;; - ubuntu-gnome) - add_task install minimal standard ubuntu-gnome-desktop - LIVE_TASK='ubuntu-gnome-live' + ubuntu-gnome|ubuntu-unity) + add_task install minimal standard ${PROJECT}-desktop + LIVE_TASK=${PROJECT}-live ;; ubuntu-budgie) @@ -885,11 +885,6 @@ case $PROJECT in LIVE_TASK='ubuntu-mate-live' ;; - ubuntu-unity) - add_task install minimal standard ubuntu-unity-desktop - LIVE_TASK=ubuntu-unity-live - ;; - ubuntustudio-dvd) add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography case $ARCH in