Imported 2.555

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.555) disco; urgency=medium
+
+  * Apparently the last raspi3 image rename was not what cdimage expected.
+    Link to the expected name instead, so that we can change it to something
+    more sensible once raspi2 is migrated to ubuntu-image.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 10 Jan 2019 22:54:23 +0100
+
 livecd-rootfs (2.554) disco; urgency=medium
 
   * Default to IMAGEFORMAT=ubuntu-image for raspi3 ubuntu-cpc builds.

live-build/auto/build

@@ -43,11 +43,10 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 		# XXX: currently we only have one image generated, but really
 		#  we should be supporting more than one for models that
 		#  define those.
-		# Also, we use the .disk1.img suffix so that the resulting
-		# image path is compatible with how raspi2 images are consumed
-		# by cdimage.
-		mv output/*.img "$PREFIX".disk1.img
-		xz -0 -T4 "$PREFIX".disk1.img
+		mv output/*.img "$PREFIX".img
+		xz -0 -T4 "$PREFIX".img
+		# Also link the output image to a filename that cdimage expects
+		ln "$PREFIX".img.xz livecd.ubuntu-cpc.disk1.img.xz
 		mv output/filesystem.manifest "$PREFIX".manifest
 	fi