From 5136ee41045a7a19beb3b337537aa946b0df0e3a Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 8 Jul 2020 14:03:56 -0700 Subject: [PATCH 1/2] Perform a dist-upgrade prior to installing packages for bootable-buildd image in order to pull in package updates --- live-build/buildd/hooks/52-linux-virtual-image.binary | 3 +++ 1 file changed, 3 insertions(+) diff --git a/live-build/buildd/hooks/52-linux-virtual-image.binary b/live-build/buildd/hooks/52-linux-virtual-image.binary index a0c64d75..d8efab84 100755 --- a/live-build/buildd/hooks/52-linux-virtual-image.binary +++ b/live-build/buildd/hooks/52-linux-virtual-image.binary @@ -39,6 +39,9 @@ trap cleanup_linux_virtual EXIT # Install dependencies env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \ update --assume-yes +# Perform a dist-upgrade to pull in package updates +env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \ + dist-upgrade --assume-yes env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \ install -y lsb-release locales initramfs-tools busybox-initramfs \ udev dbus netplan.io cloud-init openssh-server sudo snapd From 7ad64297f7f9076b5410dc7a4cc3c164dd86f95c Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Mon, 13 Jul 2020 09:10:50 -0700 Subject: [PATCH 2/2] Remove explicit install of grub-efi-* package as it is not necessary, and potentially overexplicit --- live-build/buildd/hooks/02-disk-image-uefi.binary | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary index 75d93aa5..18f74bae 100755 --- a/live-build/buildd/hooks/02-disk-image-uefi.binary +++ b/live-build/buildd/hooks/02-disk-image-uefi.binary @@ -84,8 +84,7 @@ install_grub() { efi_target=arm-efi ;; amd64) - chroot mountpoint apt-get install -qqy grub-pc - chroot mountpoint apt-get install -qqy grub-efi-amd64-signed shim-signed + chroot mountpoint apt-get install -qqy grub-pc shim-signed efi_target=x86_64-efi ;; esac