From 35a56a5e03dfeffea8837c7e7d5834007378d331 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 18 May 2023 09:27:41 +1200 Subject: [PATCH] auto/config: switch ubuntucinnamon and ubuntu-unity builds to use add_task to get their desktop packages. Previously most (all?) flavour builds got the snaps from that flavour's "desktop" seed implicitly added, but now an explicit add_task is needed. --- debian/changelog | 9 +++++++++ live-build/auto/config | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 01e89bdf..e240d416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.840) UNRELEASED; urgency=medium + + * auto/config: switch ubuntucinnamon and ubuntu-unity builds to use add_task + to get their desktop packages. Previously most (all?) flavour builds got + the snaps from that flavour's "desktop" seed implicitly added, but now an + explicit add_task is needed. + + -- Michael Hudson-Doyle Thu, 18 May 2023 09:25:38 +1200 + livecd-rootfs (2.839) mantic; urgency=medium * Drop use of --removable flag to grub-install from diff --git a/live-build/auto/config b/live-build/auto/config index db75472c..4d6c080f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -847,8 +847,7 @@ case $PROJECT in ;; ubuntucinnamon) - add_task install minimal standard - add_package install ubuntucinnamon-desktop + add_task install minimal standard ubuntucinnamon-desktop # XXX: Adding live packages manually temporarily until we have # the live task for ubuntucinnamon set up properly. add_package live ubiquity-frontend-gtk @@ -910,8 +909,7 @@ case $PROJECT in ;; ubuntu-unity) - add_task install minimal standard - add_package install ubuntu-unity-desktop + add_task install minimal standard ubuntu-unity-desktop # XXX: Adding live packages manually temporarily until we have # the live task for ubuntu-unity set up properly. add_package live metacity ubiquity-frontend-gtk