Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-10 12:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Use kvm kernel only on amd64.

Browse Source 
* Make non-x86 minimized images consistent with x86 by not explicitly
  installing the server task.
* Clean up dangling /boot/initrd.img symlink left behind on minimized
  builds.
This commit is contained in:
Steve Langasek 2017-10-20 23:10:26 -07:00
parent 813eb816ca
commit d5c4f11daa
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.408.21) UNRELEASED; urgency=medium
* Use kvm kernel only on amd64.
* Make non-x86 minimized images consistent with x86 by not explicitly
installing the server task.
* Clean up dangling /boot/initrd.img symlink left behind on minimized
builds.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 20 Oct 2017 23:01:32 -0700
livecd-rootfs (2.408.20) xenial; urgency=medium
* Now that grub-related diversions have been factored out in 2.466

10
debian/tests/minimized vendored
View File

@ -1,11 +1,3 @@
#!/bin/sh
ARCH=$(dpkg --print-architecture)
failure_code=1
if [ "$ARCH" = ppc64el ]; then
# not a regression; don't block while debugging
failure_code=0
fi
env SELECTED_TRIPLETS=ubuntu-cpc:minimized:ubuntu-cpc debian/tests/default-bootstraps || exit $failure_code
env SELECTED_TRIPLETS=ubuntu-cpc:minimized:ubuntu-cpc debian/tests/default-bootstraps

13
live-build/auto/config
View File

@ -511,7 +511,7 @@ case $PROJECT in
# linux-kvm is available since you control the
# archive and can provide this metapackage as
# necessary.
if [ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]; then
if [ "$ARCH" != "amd64" ] || ([ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]); then
KERNEL_FLAVOURS=virtual
else
KERNEL_FLAVOURS=kvm
@ -520,6 +520,11 @@ case $PROJECT in
add_task install minimal standard cloud-image
add_package install ubuntu-minimal
KERNEL_FLAVOURS=virtual
case $ARCH in
armhf|arm64|ppc64el|powerpc)
add_task install server
;;
esac
fi
BINARY_REMOVE_LINUX=false
@ -528,19 +533,13 @@ case $PROJECT in
armhf)
KERNEL_FLAVOURS=generic-lpae
add_package install flash-kernel
add_task install server
;;
arm64)
KERNEL_FLAVOURS=generic
add_package install flash-kernel
add_task install server
;;
ppc64el)
add_task install server
;;
powerpc)
KERNEL_FLAVOURS=powerpc64-smp
add_task install server
;;
esac
OPTS="${OPTS:+$OPTS }--system=normal"

5
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
View File

@ -154,6 +154,11 @@ if [ -f "${rootd}/etc/overlayroot.conf" ] &&
} > "${rootd}/etc/overlayroot.local.conf"
fi
# previous steps may have left a dangling symlink here with
# SUBPROJECT=minimized and that breaks lb_chroot_hacks step
if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; then
rm "${rootd}/boot/initrd.img"
fi
#### END COMMON ARCH FUNCTIONS