Merge branch 'ubuntu/master_parallel_cpc_fixes' into ubuntu/master

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.585) UNRELEASED; urgency=medium
+
+  * ubuntu-cpc: Ensure base disk image is the same between all build targets
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Thu, 02 May 2019 16:03:39 -0500
+
 livecd-rootfs (2.584) eoan; urgency=medium
 
   * Build WSL rootfs tarball (LP: #1827930)

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
+        # FIXME: code duplicated between disk-image.binary
-        # and 033-disk-image-uefi.binary.  We want to fix this to not
+        # 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

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"

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

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

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

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

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)

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: