From 7e8036822d2da12a377e88e244417531c4a084b8 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 30 Nov 2018 10:47:06 +0000 Subject: [PATCH] Imported 2.525.10 No reason for CPC update specified. --- debian/changelog | 14 ++++++++++++++ debian/control | 2 +- live-build/auto/config | 1 + .../ubuntu-cpc/hooks/033-disk-image-uefi.binary | 6 ++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 64b7f144..102da40e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +livecd-rootfs (2.525.10) bionic; urgency=medium + + [ Cody Shepherd ] + * Include grub efi packages in manifests for uefi images. + (LP: #1805190) + + [ Robert C Jennings ] + * Disable checksum generation. (LP: #1799773) + + [Steve Langasek] + * Fix Vcs-Bzr link. + + -- Steve Langasek Mon, 26 Nov 2018 12:55:11 -0800 + livecd-rootfs (2.525.9) bionic; urgency=medium * Ensure /lib/modules exists in root tarballs and sqashfs. diff --git a/debian/control b/debian/control index f6468b91..74a03380 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Build-Depends: debhelper (>= 7) Maintainer: Ubuntu Developers Standards-Version: 3.9.6 -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk +Vcs-Bzr: lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed/ Package: livecd-rootfs Architecture: any diff --git a/live-build/auto/config b/live-build/auto/config index dc3a8282..ba554125 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -839,6 +839,7 @@ lb config noauto \ --initsystem none \ --bootloader "$BOOTLOADER" \ ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \ + --checksums none \ --cache false \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ $OPTS \ diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary index 83cc466d..7839c49e 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -93,6 +93,12 @@ install_grub() { ;; esac + # This call to populate the package manifest is added here to capture + # grub-efi packages that otherwise would not make it into the base + # manifest. filesystem.packages is moved into place via symlinking to + # livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs + dpkg-query --show --admindir="mountpoint/var/lib/dpkg" > "binary/boot/filesystem.packages" + chroot mountpoint grub-install "${loop_device}" \ --boot-directory=/boot \ --efi-directory=/boot/efi \