Import patches-unapplied version 2.465 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: be46ea0ff6

New changelog entries:
  * Skip installation of kernel headers for all minimal images
  * Use the kvm kernel flavor for minimized cloud image where available,
    not virtual.
impish
Steve Langasek 7 years ago committed by usd-importer
parent be46ea0ff6
commit 8168b7c92a

8
debian/changelog vendored

@ -1,3 +1,11 @@
livecd-rootfs (2.465) artful; urgency=medium
* Skip installation of kernel headers for all minimal images
* Use the kvm kernel flavor for minimized cloud image where available,
not virtual.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 04 Oct 2017 10:31:20 -0700
livecd-rootfs (2.464) artful; urgency=medium
* Ignore failure of new autopkgtest on ppc64el, where it's not a

@ -239,7 +239,7 @@ esac
SIGNED_KERNEL_PACKAGE="linux-signed-generic"
if [ "${SUBPROJECT:-}" = minimized ]; then
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image"
fi
case $PROJECT in
@ -531,14 +531,28 @@ case $PROJECT in
if [ "${SUBPROJECT:-}" = minimized ]; then
add_task install cloud-image
add_package install sudo
# linux-kvm currently only exists in xenial, not in
# non-LTS suites. Fall back to virtual flavor, which
# may or may not boot initramfsless but enables us to
# 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 [ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]; then
KERNEL_FLAVOURS=virtual
else
KERNEL_FLAVOURS=kvm
fi
else
add_task install minimal standard cloud-image
add_package install ubuntu-minimal
KERNEL_FLAVOURS=virtual
fi
BINARY_REMOVE_LINUX=false
OPTS="${OPTS:+$OPTS }--initramfs=none"
KERNEL_FLAVOURS=virtual
case $ARCH in
armhf)
KERNEL_FLAVOURS=generic-lpae

Loading…
Cancel
Save