[neon/neon/livecd-rootfs/Neon/release-lts] /: update to new version from launchpad patch
Jonathan Riddell
null at kde.org
Tue Feb 16 17:59:54 GMT 2021
Git commit 0dc1f511fececd0023014642b4eb6492d9af19da by Jonathan Riddell.
Committed on 16/02/2021 at 17:59.
Pushed by jriddell into branch 'Neon/release-lts'.
update to new version from launchpad patch
M +25 -0 debian/changelog
M +1 -1 live-build/buildd/hooks/02-disk-image-uefi.binary
M +4 -0 live-build/buildd/hooks/50-buildd-tar.binary
M +4 -0 live-build/buildd/hooks/51-buildd-lxd.binary
M +5 -2 live-build/buildd/hooks/52-linux-virtual-image.binary
M +3 -1 live-build/functions
M +1 -1 live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
M +1 -11 live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
M +1 -1 live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
M +1 -1 live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
https://invent.kde.org/neon/neon/livecd-rootfs/commit/0dc1f511fececd0023014642b4eb6492d9af19da
diff --git a/debian/changelog b/debian/changelog
index d3f8cbdd..93c6c544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+livecd-rootfs (2.664.17) focal; urgency=medium
+
+ [ David Krauser ]
+ * buildd: produce kernel and initrd as separate artifacts LP: #1910557
+ * buildd: call update-initramfs for all installed kernels
+ We only have one kernel installed, so we don't need to
+ specify an explicit version. LP: #1910557
+
+ [ Dimitri John Ledkov ]
+ * esp: install grub in ubuntu bootloader id path, instead of removable.
+ (LP: #1912830)
+ * esp: perform fsck. (LP: #1912835)
+ * Perform fsck on all rootfs. (LP: #1912835)
+ * functions: stop removing systemd-detect-virt unconditionally in undivert_grub
+ (LP: #1902260)
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com> Tue, 09 Feb 2021 00:52:00 +0000
+
+livecd-rootfs (2.664.16) focal; urgency=medium
+
+ [ Cody Shepherd ]
+ * Produce manifests for buildd tarball images (LP: #1914445)
+
+ -- Robert C Jennings <robert.jennings at canonical.com> Fri, 05 Feb 2021 14:57:56 -0600
+
livecd-rootfs (2.664.15) focal; urgency=medium
* Properly handle lowlatency-hwe-* (LP: #1914217)
diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary
index 18f74bae..f75e3aa2 100755
--- a/live-build/buildd/hooks/02-disk-image-uefi.binary
+++ b/live-build/buildd/hooks/02-disk-image-uefi.binary
@@ -49,7 +49,7 @@ create_and_mount_uefi_partition() {
mount "${uefi_dev}" "$mountpoint"/boot/efi
cat << EOF >> "mountpoint/etc/fstab"
-LABEL=UEFI /boot/efi vfat defaults 0 0
+LABEL=UEFI /boot/efi vfat defaults 0 1
EOF
}
diff --git a/live-build/buildd/hooks/50-buildd-tar.binary b/live-build/buildd/hooks/50-buildd-tar.binary
index c9c4663a..738e5f9a 100755
--- a/live-build/buildd/hooks/50-buildd-tar.binary
+++ b/live-build/buildd/hooks/50-buildd-tar.binary
@@ -4,6 +4,10 @@
# ourselves.
set -e
+. config/functions
+
+create_manifest chroot "livecd.$PROJECT.rootfs.manifest"
+
# gzip was chosen for fastest decompression speed: it decompresses buildd
# chroots about twice as fast as xz and about five times as fast as bzip2.
tar --transform='s,^chroot,chroot-autobuild,' --sort=name --numeric-owner \
diff --git a/live-build/buildd/hooks/51-buildd-lxd.binary b/live-build/buildd/hooks/51-buildd-lxd.binary
index 44b38213..85daa72a 100755
--- a/live-build/buildd/hooks/51-buildd-lxd.binary
+++ b/live-build/buildd/hooks/51-buildd-lxd.binary
@@ -3,12 +3,16 @@
set -e
. config/bootstrap
+. config/functions
TMPDIR="$(mktemp -d)"
config/make-lxd-metadata "${LB_DISTRIBUTION%-*}" "$ARCH" \
>"$TMPDIR/metadata.yaml"
tar --numeric-owner -cf "livecd.$PROJECT.lxd.tar" -C "$TMPDIR" metadata.yaml
rm -rf "$TMPDIR"
+
+create_manifest chroot "livecd.$PROJECT.lxd.manifest"
+
# When using the combined metadata/rootfs form, the rootfs must be under
# rootfs/ rather than under chroot-autobuild/.
tar --transform='s,^chroot,rootfs,' --sort=name --numeric-owner \
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 \
diff --git a/live-build/functions b/live-build/functions
index e3a06593..afe82d23 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -386,7 +386,9 @@ undivert_grub() {
--divert /etc/grub.d/30_os-prober.dpkg-divert \
--rename /etc/grub.d/30_os-prober
- rm "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+ if grep -q "^exit 1$" "$CHROOT_ROOT"/usr/bin/systemd-detect-virt; then
+ rm "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+ fi
chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
--rename /usr/bin/systemd-detect-virt
}
diff --git a/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot b/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
index 461c752f..17c2e931 100755
--- a/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
+++ b/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
@@ -2,5 +2,5 @@
cat >>/etc/fstab<<EOT
# Minimal setup required for systemd to provide a r/w FS
-/dev/root / rootfs defaults 0 0
+/dev/root / rootfs defaults 0 1
EOT
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index cb3d9822..b9b5aa17 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -94,7 +94,7 @@ create_and_mount_uefi_partition() {
mount "${uefi_dev}" "$mountpoint"/boot/efi
cat << EOF >> "mountpoint/etc/fstab"
-LABEL=UEFI /boot/efi vfat defaults 0 0
+LABEL=UEFI /boot/efi vfat defaults 0 1
EOF
}
@@ -212,19 +212,9 @@ EOF
--boot-directory=/boot \
--efi-directory=/boot/efi \
--target=${efi_target} \
- --removable \
--uefi-secure-boot \
--no-nvram
- if [ -f mountpoint/boot/efi/EFI/BOOT/grub.cfg ]; then
- sed -i "s| root| root hd0,gpt1|" mountpoint/boot/efi/EFI/BOOT/grub.cfg
- sed -i "1i${IMAGE_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg
- # For some reason the grub disk is looking for /boot/grub/grub.cfg on
- # part 15....
- chroot mountpoint mkdir -p /boot/efi/boot/grub
- chroot mountpoint cp /boot/efi/EFI/BOOT/grub.cfg /boot/efi/boot/grub
- fi
-
if [ "$ARCH" = "amd64" ]; then
# Install the BIOS/GPT bits. Since GPT boots from the ESP partition,
# it means that we just run this simple command and we're done
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
index 7817c430..391ae370 100755
--- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
@@ -72,7 +72,7 @@ if [ -n "${root_fs_label}" ]; then
sed -i "s,^[^#${bl}]*\([${bl}]*/[${bl}].*\),${lstr}\1," "${rootd}/etc/fstab"
fi
cat > /etc/fstab << EOM
-LABEL=cloudimg-rootfs / ext4 defaults 0 0
+LABEL=cloudimg-rootfs / ext4 defaults 0 1
EOM
# for quantal and newer, add /etc/overlayroot.local.conf
diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
index 23697b8e..b27aebd2 100644
--- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
+++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
@@ -48,7 +48,7 @@ hv_sock
EOF
cat << EOF >> "${scratch_d}/etc/fstab"
-LABEL=$FS_LABEL / ext4 defaults 0 0
+LABEL=$FS_LABEL / ext4 defaults 0 1
EOF
# Customise xrdp
More information about the Neon-commits
mailing list