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

@@ -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
 

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
+		-o "$PREFIX".img "$PREFIX".model-assertion
-	xz -0 -T4 livecd."$PROJECT".img
+	xz -0 -T4 "$PREFIX".img
 	mv seed.manifest "PREFIX".manifest
 	exit 0
 fi

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 "----------------------------------------------------------"