Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-12 03:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge lp:~daniel-thewatkins/livecd-rootfs/1775472

Browse Source
This commit is contained in:
Steve Langasek 2018-06-06 17:29:44 -07:00
commit 4eae5bc0e7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.531) UNRELEASED; urgency=medium
* ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472).
-- Daniel Watkins <oddbloke@ubuntu.com> Wed, 06 Jun 2018 17:17:32 -0700
livecd-rootfs (2.530) cosmic; urgency=medium livecd-rootfs (2.530) cosmic; urgency=medium
* ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233). * ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233).

13
live-build/auto/config
View File

@ -600,16 +600,9 @@ case $PROJECT in
if [ "${SUBPROJECT:-}" = minimized ]; then if [ "${SUBPROJECT:-}" = minimized ]; then
add_task install cloud-image add_task install cloud-image
add_package install sudo add_package install sudo
# linux-kvm currently only exists in xenial, not in # linux-kvm currently only exists for amd64, so fall back to the
# non-LTS suites. Fall back to virtual flavor, which # virtual flavour for other architectures
# may or may not boot initramfsless but enables us to if [ "$ARCH" = "amd64" ]; then
# test building and possibly build derivative images
# using other kernel flavors.
# If you enable an extra ppa, it is assumed that
# linux-kvm is available since you control the
# archive and can provide this metapackage as
# necessary.
if [ "$ARCH" = "amd64" ] && ([ -n "$EXTRA_PPAS" ] || [ "$SUITE" = xenial ] || [ "$SUITE" = bionic ]); then
KERNEL_FLAVOURS=kvm KERNEL_FLAVOURS=kvm
else else
KERNEL_FLAVOURS=virtual KERNEL_FLAVOURS=virtual