From d169cb531c559b854e642313bf538357f983ac0d Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 6 Sep 2023 14:36:29 -0700 Subject: [PATCH] ubuntukylin-default-settings is part of the task, don't hard-code the package. --- debian/changelog | 2 ++ live-build/auto/config | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f394d122..87a9649a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ livecd-rootfs (23.10.33) UNRELEASED; urgency=medium * generic is the default kernel flavor in live-build on Ubuntu; remove hard-coded cargo-culting of this setting. * Drop references to kubuntu-dvd, obsoleted in 2012. + * ubuntukylin-default-settings is part of the task, don't hard-code the + package. -- Steve Langasek Wed, 06 Sep 2023 11:23:17 -0700 diff --git a/live-build/auto/config b/live-build/auto/config index ec695797..6b13f132 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -799,7 +799,7 @@ case $PROJECT in LIVE_TASK='edubuntu-live' ;; - lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon) + lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon|ubuntukylin) add_task install minimal standard ${PROJECT}-desktop LIVE_TASK=${PROJECT}-live ;; @@ -875,12 +875,6 @@ case $PROJECT in esac ;; - ubuntukylin) - add_task install minimal standard ubuntukylin-desktop - add_package install ubuntukylin-default-settings - LIVE_TASK='ubuntukylin-live' - ;; - ubuntu-server) case ${SUBPROJECT:-} in live)