From 2a51702ede07202578ab60fb39a9bcb9d69d98b2 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Wed, 9 Mar 2022 10:59:14 +0000 Subject: [PATCH] Imported 2.759 No reason for CPC update specified. --- debian/changelog | 14 ++++++++++++++ live-build/functions | 9 +++++++-- .../ubuntu-cpc/hooks.d/base/series/disk-image | 2 +- .../ubuntu-cpc/hooks.d/base/series/disk-image-uefi | 8 ++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi diff --git a/debian/changelog b/debian/changelog index f4f833fb..13a538c1 100644 --- a/debian/changelog +++ b/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 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 Thu, 03 Mar 2022 15:44:52 +0100 + livecd-rootfs (2.757) jammy; urgency=medium [ Dave Jones ] diff --git a/live-build/functions b/live-build/functions index 2825687c..79cca5ef 100644 --- a/live-build/functions +++ b/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 - echo "Legacy snap with no base declaration found, refusing to install 'core' snap" - exit 1 + 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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image index fa13c6f1..3b356075 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image +++ b/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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi new file mode 100644 index 00000000..438930b7 --- /dev/null +++ b/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