From e60bcbaecdf9669a921eea1ae45ea475cd7a31bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Wed, 9 Jan 2019 10:47:24 +0100
Subject: [PATCH] Add proper IMAGAFORMAT for raspi3 classic builds, output the
 images with the expected naming.

---
 debian/changelog       | 8 ++++++++
 live-build/auto/build  | 7 +++++--
 live-build/auto/config | 7 ++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 638b7e38..ed16447f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.554) UNRELEASED; urgency=medium
+
+  * Default to IMAGEFORMAT=ubuntu-image for raspi3 ubuntu-cpc builds.
+  * Rename the resulting raspi3 image file to *.disk1.img.xz to be compatible
+    with how raspi2 images are provided.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 09 Jan 2019 10:34:59 +0100
+
 livecd-rootfs (2.553) disco; urgency=medium
 
   * Add a LXD image to builds for the buildd subproject.
diff --git a/live-build/auto/build b/live-build/auto/build
index a980c26c..970d66af 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -43,8 +43,11 @@ 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.
-		mv output/*.img "$PREFIX".img
-		xz -0 -T4 "$PREFIX".img
+		# 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/filesystem.manifest "$PREFIX".manifest
 	fi
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 2cafdb4e..c9ec49f1 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -109,7 +109,12 @@ add_binary_hook ()
 if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*)
-			IMAGEFORMAT=ext4
+			if [ "$SUBARCH" = "raspi3" ]; then
+				# For now only raspi3, but others are soon to follow
+				IMAGEFORMAT=ubuntu-image
+			else
+				IMAGEFORMAT=ext4
+			fi
 			;;
 		ubuntu-server:live)
 			IMAGEFORMAT=plain