From 1814fdb36933b86500ea170e343a48f37520a2ef Mon Sep 17 00:00:00 2001 From: David Krauser Date: Mon, 28 Sep 2020 11:12:19 -0400 Subject: [PATCH] Produce buildd kernel and initrd as separate artifacts Multipass on Mac OS X requires standalone kernel and initrd artifacts to boot. Also call update-initramfs on all installed kernels. We only have one kernel installed, so we don't need to specify an explicit version. --- debian/changelog | 9 +++++++++ live-build/buildd/hooks/52-linux-virtual-image.binary | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bd4ec43..e0c1165e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.695) UNRELEASED; urgency=medium + + * buildd: produce kernel and initrd as separate artifacts + * buildd: call update-initramfs for all installed kernels + We only have one kernel installed, so we don't need to + specify an explicit version. + + -- David Krauser Tue, 20 Oct 2020 15:00:38 -0400 + livecd-rootfs (2.694.1) groovy; urgency=medium * livecd-rootfs SRU of change up to 2.699 from hirsute to groovy. diff --git a/live-build/buildd/hooks/52-linux-virtual-image.binary b/live-build/buildd/hooks/52-linux-virtual-image.binary index d8efab84..39ea7780 100755 --- a/live-build/buildd/hooks/52-linux-virtual-image.binary +++ b/live-build/buildd/hooks/52-linux-virtual-image.binary @@ -56,8 +56,11 @@ chroot "$mount_d" update-grub undivert_grub "$mount_d" # Update initramfs image -chroot "$mount_d" \ - sh -c 'update-initramfs -c -v -k $(ls /boot/vmlinuz*generic | sed 1q | cut -d- -f2-3)' +chroot "$mount_d" update-initramfs -c -v -k all + +# extract kernel and initrd +cp $mount_d/boot/initrd.img-* livecd.$PROJECT.initrd-generic +cp $mount_d/boot/vmlinuz-* livecd.$PROJECT.vmlinuz-generic # Cleanup env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \