generic is the default kernel flavor in live-build on Ubuntu; remove hard-coded cargo-culting of this setting.

This commit is contained in:
Steve Langasek 2023-09-06 12:56:27 -07:00
parent 5776828153
commit 214fee87ee
2 changed files with 2 additions and 7 deletions

2
debian/changelog vendored
View File

@ -13,6 +13,8 @@ livecd-rootfs (23.10.33) UNRELEASED; urgency=medium
* Drop references to mythbuntu, obsolete after xenial.
* Parameterize and consolidate live image definitions for flavors using
a common pattern
* generic is the default kernel flavor in live-build on Ubuntu; remove
hard-coded cargo-culting of this setting.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 06 Sep 2023 11:23:17 -0700

View File

@ -802,7 +802,6 @@ case $PROJECT in
ubuntucinnamon)
add_task install minimal standard ubuntucinnamon-desktop
LIVE_TASK=ubuntucinnamon-live
KERNEL_FLAVOURS=generic
;;
xubuntu)
@ -815,17 +814,11 @@ case $PROJECT in
;;
esac
LIVE_TASK='xubuntu-live'
case $ARCH in
amd64) KERNEL_FLAVOURS=generic ;;
esac
;;
lubuntu)
add_task install minimal standard lubuntu-desktop
LIVE_TASK='lubuntu-live'
case $ARCH in
amd64) KERNEL_FLAVOURS=generic ;;
esac
;;
ubuntu-gnome|ubuntu-unity)