From 01b851e16210924cea8067e858ed73e05fd74ff4 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 17 May 2023 13:25:21 +1200 Subject: [PATCH] auto/config: Set FLAVOUR appropriately for flavours added since the expand-task branch was created. --- debian/changelog | 7 +++++++ live-build/auto/config | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bcf1d89c..a90ba22f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.838) UNRELEASED; urgency=medium + + * auto/config: Set FLAVOUR appropriately for flavours added since the + expand-task branch was created. + + -- Michael Hudson-Doyle Wed, 17 May 2023 13:24:43 +1200 + livecd-rootfs (2.837) mantic; urgency=medium * auto/config: Rewrite add_task to use a Python script that cribs the logic diff --git a/live-build/auto/config b/live-build/auto/config index 801e6aaf..ed3bf197 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -620,6 +620,9 @@ fi mkdir -p config/germinate-output case $PROJECT in + edubuntu*) + FLAVOUR=edubuntu + ;; kubuntu*) FLAVOUR=kubuntu ;; @@ -645,7 +648,7 @@ case $PROJECT in FLAVOUR=ubuntustudio ;; ubuntucinnamon*) - SEED=ubuntucinnamon.$SUITE + FLAVOUR=ubuntucinnamon ;; *) FLAVOUR=ubuntu