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

* Skip installation of kernel headers for all minimal images

Browse Source 
* Use the kvm kernel flavor for minimized cloud image where available,
  not virtual.
This commit is contained in:
Steve Langasek 2017-10-04 10:31:18 -07:00
commit 7a8f02903c
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.465) UNRELEASED; 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:30:25 -0700
livecd-rootfs (2.464) artful; urgency=medium livecd-rootfs (2.464) artful; urgency=medium
* Ignore failure of new autopkgtest on ppc64el, where it's not a * Ignore failure of new autopkgtest on ppc64el, where it's not a

18
live-build/auto/config
View File

@ -239,7 +239,7 @@ esac
SIGNED_KERNEL_PACKAGE="linux-signed-generic" SIGNED_KERNEL_PACKAGE="linux-signed-generic"
if [ "${SUBPROJECT:-}" = minimized ]; then if [ "${SUBPROJECT:-}" = minimized ]; then
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image"
fi fi
case $PROJECT in case $PROJECT in
@ -531,14 +531,28 @@ 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
# 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 else
add_task install minimal standard cloud-image add_task install minimal standard cloud-image
add_package install ubuntu-minimal add_package install ubuntu-minimal
KERNEL_FLAVOURS=virtual
fi fi
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"
KERNEL_FLAVOURS=virtual
case $ARCH in case $ARCH in
armhf) armhf)
KERNEL_FLAVOURS=generic-lpae KERNEL_FLAVOURS=generic-lpae