From 7c07f8a65b281ca906d32f08accd9dc9f3968ad6 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Thu, 9 Nov 2017 16:13:08 -0800
Subject: [PATCH] Change ubuntu-core image builds to use the standard "$PREFIX"
 naming for artifacts instead of being gratuitously different; requires a
 matching change to ubuntu-cdimage.

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

diff --git a/debian/changelog b/debian/changelog
index 2d0e04f0..4987b59a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ livecd-rootfs (2.481) UNRELEASED; urgency=medium
     a buffer of free space in order to work if booted in place.
   * ubuntu-image now produces a manifest file listing the snap revisions
     used; publish this so that it's picked up by launchpad-buildd.
+  * Change ubuntu-core image builds to use the standard "$PREFIX" naming for
+    artifacts instead of being gratuitously different; requires a matching
+    change to ubuntu-cdimage.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 08 Nov 2017 12:01:25 -0800
 
diff --git a/live-build/auto/build b/live-build/auto/build
index 467e1b60..c19d31e3 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -23,8 +23,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 
 	env SNAPPY_STORE_NO_CDN=1 \
 	ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \
-		-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
-	xz -0 -T4 livecd."$PROJECT".img
+		-o "$PREFIX".img "$PREFIX".model-assertion
+	xz -0 -T4 "$PREFIX".img
 	mv seed.manifest "PREFIX".manifest
 	exit 0
 fi
diff --git a/live-build/auto/config b/live-build/auto/config
index 4c3c5b14..71ce31c0 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -90,6 +90,7 @@ LIVE_TASK=
 PREINSTALLED=false
 PREINSTALL_POOL=
 PREINSTALL_POOL_SEEDS=
+PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
 
 CHROOT_HOOKS=
 BINARY_HOOKS=
@@ -181,7 +182,7 @@ case $IMAGEFORMAT in
 		echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
 		echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 		# Store model assertion in top dir to get it picked up later as a build artifact
-		env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > livecd."$PROJECT".model-assertion
+		env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
 		echo "Configured ubuntu-image for the following model assertion:"
 		cat livecd."$PROJECT".model-assertion
 		echo "----------------------------------------------------------"