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

Import patches-unapplied version 2.531 to ubuntu/cosmic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: d9fe4558cfaf48e584d5bdeb949f0f1510e76217

New changelog entries:
  [ Daniel Watkins ]
  * ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472).
  [ Steve Langasek ]
  * live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary: don't manually
    install grub-efi-amd64 since that forces off grub-pc, which is otherwise
    now coinstallable.
This commit is contained in:
Steve Langasek 2018-06-06 17:34:07 -07:00 committed by usd-importer
parent d9fe4558cf
commit 8b47481862
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
livecd-rootfs (2.531) cosmic; urgency=medium
[ Daniel Watkins ]
* ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472).
[ Steve Langasek ]
* live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary: don't manually
install grub-efi-amd64 since that forces off grub-pc, which is otherwise
now coinstallable.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 06 Jun 2018 17:34:07 -0700
livecd-rootfs (2.530) cosmic; urgency=medium
* 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
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 [ "$ARCH" = "amd64" ] && ([ -n "$EXTRA_PPAS" ] || [ "$SUITE" = xenial ] || [ "$SUITE" = bionic ]); then
# linux-kvm currently only exists for amd64, so fall back to the
# virtual flavour for other architectures
if [ "$ARCH" = "amd64" ]; then
KERNEL_FLAVOURS=kvm
else
KERNEL_FLAVOURS=virtual

2
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
View File

@ -88,7 +88,7 @@ install_grub() {
efi_target=arm-efi
;;
amd64)
chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
chroot mountpoint apt-get install -qqy grub-efi-amd64-signed shim-signed
efi_target=x86_64-efi
;;
esac