Imported 2.707

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.707) hirsute; urgency=medium
+
+  * qcow2-image: unbreak builds without subarch.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Sat, 05 Dec 2020 15:17:46 +0000
+
 livecd-rootfs (2.706) hirsute; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]

live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary

@@ -7,7 +7,7 @@ case $ARCH:$SUBARCH in
 		xz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
 	        exit 0
 		;;
-	riscv64:*)
+	riscv64:hifive)
 		xz -T4 -c binary/boot/disk-uefi.ext4 > livecd.ubuntu-cpc.disk1.img.xz
 	        exit 0
 		;;