Imported 2.660

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,25 @@
+livecd-rootfs (2.660) focal; urgency=medium
+
+  * Remove dependencies on qemu-utils and snapd on riscv64, we don't have
+    those yet, but at least we can be on parity with i386 livecd-rootfs
+    already.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Sun, 12 Apr 2020 15:42:06 +0100
+
+livecd-rootfs (2.659) focal; urgency=medium
+
+  * Fix logic to ensure snapd is seeded in core18-only images (LP: #1871919)
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Thu, 09 Apr 2020 14:16:40 -0500
+
+livecd-rootfs (2.658) focal; urgency=medium
+
+  * Remove some deprecated raspi2 special-casing, switch the main universal
+    raspi SUBARCH to use the raspi KERNEL_FLAVOUR now that the kernel packages
+    have been renamed.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 08 Apr 2020 10:03:21 +0200
+
 livecd-rootfs (2.657) focal; urgency=medium
 
   * server: networkd applies the first sorted matching network file, thus

debian/control

@@ -32,9 +32,9 @@ Depends: ${misc:Depends},
          python3-apt,
          python3-software-properties,
          python3-yaml,
-         qemu-utils [!i386],
+         qemu-utils [!i386 !riscv64],
          rsync,
-         snapd (>= 2.39) [!i386],
+         snapd (>= 2.39) [!i386 !riscv64],
          squashfs-tools (>= 1:3.3-1),
          sudo,
          u-boot-tools [armhf arm64],

live-build/auto/config

@@ -912,15 +912,9 @@ case $ARCH in
 	armhf|arm64)
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
-			raspi2)
-				COMPONENTS='main restricted universe multiverse'
-				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
-				BINARY_REMOVE_LINUX=false
-				;;
 			raspi)
 				# Generic Raspberry Pi images
 				COMPONENTS='main restricted universe multiverse'
-				KERNEL_FLAVOURS=raspi2
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
 				BINARY_REMOVE_LINUX=false
 				;;

live-build/functions

@@ -541,11 +541,7 @@ EOF
     echo -n "    file: " >> $seed_yaml
     (cd $snaps_dir; ls -1 ${SNAP_NAME}_*.snap) >> $seed_yaml
 
-    # If $core_snap is the empty string then SNAP itself *may be* a core snap,
-    # and we run some post-processing logic.
-    if [ -z "$core_snap" ]; then
-        _snap_post_process $CHROOT_ROOT $SNAP_NAME
-    fi
+    _snap_post_process $CHROOT_ROOT $SNAP_NAME
 }
 
 snap_prepare_assertions() {
@@ -624,12 +620,6 @@ snap_prepare() {
     local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
 
     snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL"
-
-    # ubuntu-cpc:minimized has its own special snap handling
-    if [ "$PROJECT:${SUBPROJECT:-}" != ubuntu-cpc:minimized ]; then
-        # Download the core snap
-        _snap_preseed "$CHROOT_ROOT" core stable
-    fi
 }
 
 snap_preseed() {