Imported 2.661

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-04-16 15:18:32 +00:00
parent daf0650970
commit 4b64af9bdf
3 changed files with 8 additions and 7 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.661) focal; urgency=medium
* Switch Ubuntu desktop to only hwe-20.04 kernel flavour.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 16 Apr 2020 01:30:36 +0100
livecd-rootfs (2.660) focal; urgency=medium
* Remove dependencies on qemu-utils and snapd on riscv64, we don't have

View File

@ -820,7 +820,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
continue
fi
case $FLAVOUR in
virtual)
virtual|generic-hwe-*)
FLAVOUR="generic"
;;
oem-*)

View File

@ -581,12 +581,7 @@ case $PROJECT in
LIVE_TASK='ubuntu-live'
add_task install minimal standard ubuntu-desktop
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
KERNEL_FLAVOURS='generic'
case $ARCH in
amd64)
KERNEL_FLAVOURS='generic oem-20.04'
;;
esac
KERNEL_FLAVOURS='generic-hwe-20.04'
;;
esac
;;