From fd2a234f5b4b0f2578a8c0d14ccb0dab43223cf6 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Tue, 28 May 2019 21:26:03 +0000 Subject: [PATCH] Imported 2.578.4 No reason for CPC update specified. --- debian/changelog | 15 +++++++++++++++ .../hooks.d/base/disk-image-uefi.binary | 4 ++-- .../ubuntu-cpc/hooks.d/base/root-squashfs.binary | 2 +- live-build/ubuntu-cpc/hooks.d/base/root-xz.binary | 2 +- .../ubuntu-cpc/hooks.d/base/series/root-dir | 2 ++ .../ubuntu-cpc/hooks.d/base/series/squashfs | 2 ++ live-build/ubuntu-cpc/hooks.d/base/series/tarball | 2 ++ .../ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary | 2 +- live-build/ubuntu-cpc/hooks.d/make-hooks | 2 +- magic-proxy | 1 + 10 files changed, 28 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index b76e2fd2..da3f522e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +livecd-rootfs (2.578.4) disco; urgency=medium + + [ Robert C Jennings ] + * magic-proxy: Send headers on error (LP: #1829944) + + -- Steve Langasek Thu, 23 May 2019 13:33:40 -0700 + +livecd-rootfs (2.578.3) disco; urgency=medium + + [ Robert C Jennings ] + * ubuntu-cpc: Ensure base disk image is the same between all build targets + (LP: #1827426) + + -- Steve Langasek Tue, 21 May 2019 15:19:34 -0700 + livecd-rootfs (2.578.2) disco; urgency=medium * Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds. 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 c176de46..d51bb7a2 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 @@ -65,8 +65,8 @@ install_grub() { chroot mountpoint mkdir -p "${efi_boot_dir}" if [ -n "$partuuid" ]; then - # FIXME: code duplicated between 032-disk-image.binary - # and 033-disk-image-uefi.binary. We want to fix this to not + # FIXME: code duplicated between disk-image.binary + # and disk-image-uefi.binary. We want to fix this to not # have initramfs-tools installed at all on these images. echo "partuuid found for root device; omitting initrd" echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg diff --git a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary index c6e2273e..eb2b5318 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary @@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then exit 0 fi -# This is the directory created by 031-0-create-root-dir.binary +# This is the directory created by create-root-dir.binary rootfs_dir=rootfs.dir squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs" diff --git a/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary index b23cd8d6..609538ad 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary @@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then exit 0 fi -# This is the directory created by 031-0-create-root-dir.binary +# This is the directory created by create-root-dir.binary rootfs_dir=rootfs.dir cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/root-dir b/live-build/ubuntu-cpc/hooks.d/base/series/root-dir index b5d3b4e4..b41635af 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/root-dir +++ b/live-build/ubuntu-cpc/hooks.d/base/series/root-dir @@ -1 +1,3 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent +depends disk-image base/create-root-dir.binary diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs index 60332761..6d2cb910 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs +++ b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs @@ -1,2 +1,4 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent +depends disk-image depends root-dir base/root-squashfs.binary diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/tarball b/live-build/ubuntu-cpc/hooks.d/base/series/tarball index 2ea30bf2..184046c2 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/tarball +++ b/live-build/ubuntu-cpc/hooks.d/base/series/tarball @@ -1,2 +1,4 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent +depends disk-image depends root-dir base/root-xz.binary diff --git a/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary index f9bcfb18..a827a8a6 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary @@ -7,7 +7,7 @@ # and checksums. This step produces an OVA that is suitable for use with # Cloud's that support the OVF specification. # -# For this step, we re-use the VMDK's made in 040-vmdk-image.binary +# For this step, we re-use the VMDK's made in vmdk-image.binary case ${SUBPROJECT:-} in minimized) diff --git a/live-build/ubuntu-cpc/hooks.d/make-hooks b/live-build/ubuntu-cpc/hooks.d/make-hooks index 7796be3d..08ae45be 100755 --- a/live-build/ubuntu-cpc/hooks.d/make-hooks +++ b/live-build/ubuntu-cpc/hooks.d/make-hooks @@ -161,7 +161,7 @@ class MakeHooks: with open(series_file, "r", encoding="utf-8") as fp: for line in fp: line = line.strip() - if not line: + if not line or line.startswith("#"): continue m = re.match(r"^\s*depends\s+(\S+.*)$", line) if m: diff --git a/magic-proxy b/magic-proxy index 50481e28..e2d0c28d 100755 --- a/magic-proxy +++ b/magic-proxy @@ -843,6 +843,7 @@ class ProxyingHTTPRequestHandler(http.server.BaseHTTPRequestHandler): """Return an HTTP error status and a message in the response body.""" self.send_response(status) self.send_header("Content-Type", "text/plain; charset=utf-8") + self.end_headers() self.wfile.write(message.encode("utf-8"))