Imported 2.759

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,17 @@
+livecd-rootfs (2.759) jammy; urgency=medium
+
+  * Optionally (when ALLOW_CORE_SNAP env var is set) allow to install core
+    snap. Still needed by some CPC projects. (LP: #1964303)
+
+ -- Thomas Bechtold <thomas.bechtold@canonical.com>  Fri, 04 Mar 2022 14:00:16 +0100
+
+livecd-rootfs (2.758) jammy; urgency=medium
+
+  * Split UEFI image out of `disk-image` series file into
+    `disk-image-uefi`. (LP: #1961760)
+
+ -- Ivan Kapelyukhin <ivan.kapelyukhin@canonical.com>  Thu, 03 Mar 2022 15:44:52 +0100
+
 livecd-rootfs (2.757) jammy; urgency=medium
 
   [ Dave Jones ]

live-build/functions

@@ -595,8 +595,13 @@ _snap_preseed() {
                 # If snap info does not list a base the default is 'core'
                 # which is now an error to use.
                 if [ -z "$core_snap" ]; then
+		    if [ -z "$ALLOW_CORE_SNAP" ]; then
 			echo "Legacy snap with no base declaration found, refusing to install 'core' snap"
 			exit 1
+		    else
+			echo "Legacy snap with no base declaration found, but \$ALLOW_CORE_SNAP set. continue (but FIX YOUR SNAPS!)"
+			core_snap=${core_snap:-core}
+		    fi
                 fi
 
                 _snap_preseed $CHROOT_ROOT $core_snap stable

live-build/ubuntu-cpc/hooks.d/base/series/disk-image

@@ -1,5 +1,5 @@
+depends disk-image-uefi
 base/disk-image.binary
-base/disk-image-uefi.binary
 base/disk-image-ppc64el.binary
 provides livecd.ubuntu-cpc.ext4
 provides livecd.ubuntu-cpc.initrd-generic

live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi

@@ -0,0 +1,8 @@
+base/disk-image-uefi.binary
+provides livecd.ubuntu-cpc.ext4
+provides livecd.ubuntu-cpc.initrd-generic
+provides livecd.ubuntu-cpc.initrd-generic-lpae
+provides livecd.ubuntu-cpc.kernel-generic
+provides livecd.ubuntu-cpc.kernel-generic-lpae
+provides livecd.ubuntu-cpc.manifest
+provides livecd.ubuntu-cpc.filelist