From 5edb230a21e0360cdcd03a51dad9562219c9b1f5 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 9 Oct 2015 17:47:03 +0200 Subject: [PATCH] Import patches-unapplied version 2.349 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 8c606962fab21203597e115e446a5b035d0798cb New changelog entries: * do not hardcode installation of grub-pc for amd64 in snappy images, instead install the right grub set for secureboot there --- debian/changelog | 7 +++++++ live-build/auto/config | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 43c9a356..6cd72d93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.349) wily; urgency=medium + + * do not hardcode installation of grub-pc for amd64 in snappy images, + instead install the right grub set for secureboot there + + -- Oliver Grawert Fri, 09 Oct 2015 17:47:03 +0200 + livecd-rootfs (2.348) wily; urgency=medium * limit grub-install diversion on snappy images to x86 architectures diff --git a/live-build/auto/config b/live-build/auto/config index abb3a339..8664debf 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -402,9 +402,14 @@ case $PROJECT in # generic kernel etc KERNEL_FLAVOURS=generic case $ARCH in - i386|amd64) + i386) add_package install grub-pc ;; + amd64) + add_package install grub-pc-bin + add_package install grub-efi-amd64-signed + add_package install shim-signed + ;; armhf) add_package install flash-kernel u-boot-tools ;;