auto/config: Set FLAVOUR appropriately for flavours added since the expand-task branch was created.

This commit is contained in:
Michael Hudson-Doyle 2023-05-17 13:25:21 +12:00
parent 6b92be9504
commit 01b851e162
2 changed files with 11 additions and 1 deletions

7
debian/changelog vendored
View File

@ -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 <michael.hudson@ubuntu.com> Wed, 17 May 2023 13:24:43 +1200
livecd-rootfs (2.837) mantic; urgency=medium livecd-rootfs (2.837) mantic; urgency=medium
* auto/config: Rewrite add_task to use a Python script that cribs the logic * auto/config: Rewrite add_task to use a Python script that cribs the logic

View File

@ -620,6 +620,9 @@ fi
mkdir -p config/germinate-output mkdir -p config/germinate-output
case $PROJECT in case $PROJECT in
edubuntu*)
FLAVOUR=edubuntu
;;
kubuntu*) kubuntu*)
FLAVOUR=kubuntu FLAVOUR=kubuntu
;; ;;
@ -645,7 +648,7 @@ case $PROJECT in
FLAVOUR=ubuntustudio FLAVOUR=ubuntustudio
;; ;;
ubuntucinnamon*) ubuntucinnamon*)
SEED=ubuntucinnamon.$SUITE FLAVOUR=ubuntucinnamon
;; ;;
*) *)
FLAVOUR=ubuntu FLAVOUR=ubuntu