Merge lp:~vorlon/livecd-rootfs/ubuntu-image-improvements into lp:livecd-rootfs

[Steve Langasek]

[lp:~vorlon/livecd-rootfs/ubuntu-image-improvements]

1580. By Steve Langasek on 2017-11-08

Name the manifest the way ubuntu-cdimage expects it for subarchs

[Adam Conrad (adconrad)]

Approve of the general concept, need-fixing on implementation nitpickery, see inline.

review: Needs Fixing

[lp:~vorlon/livecd-rootfs/ubuntu-image-improvements]

1581. By Steve Langasek on 2017-11-09

move configuration bits into live-build/auto/config from live-build/auto/build, per Adam

1582. By Steve Langasek on 2017-11-10

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.

1583. By Steve Langasek on 2017-11-10

fix wrong use of PREFIX literal

[Adam Conrad (adconrad)]

Two random discussion points inline that shouldn't block the MP. +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-11-06 19:12:58 +0000
+++ debian/changelog	2017-11-10 00:13:40 +0000
@@ -1,3 +1,15 @@
+livecd-rootfs (2.481) UNRELEASED; urgency=medium
+
+  * The target for x86 ubuntu-core images is VMs, so create them with
+    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 <[e-mail]>  Wed, 08 Nov 2017 12:01:25 -0800
+
 livecd-rootfs (2.480) bionic; urgency=medium
 
   [ Gary Wang ]
 
=== modified file 'live-build/auto/build'
--- live-build/auto/build	2017-11-06 12:25:57 +0000
+++ live-build/auto/build	2017-11-10 00:13:40 +0000
@@ -15,12 +15,17 @@
     exit 1
 fi
 
+# Link output files somewhere BuildLiveCD will be able to find them.
+PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
+
 if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 	# Use ubuntu-image instead of live-build
+
 	env SNAPPY_STORE_NO_CDN=1 \
-	ubuntu-image -c edge \
-		-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
-	xz -0 -T4 livecd."$PROJECT".img
+	ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \
+		-o "$PREFIX".img "$PREFIX".model-assertion
+	xz -0 -T4 "$PREFIX".img
+	mv seed.manifest "$PREFIX".manifest
 	exit 0
 fi
 
@@ -443,9 +448,6 @@
 	exit 1
 fi
 
-# Link output files somewhere BuildLiveCD will be able to find them.
-PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
-
 case $LB_INITRAMFS in
 	casper)
 		INITFS="casper"
 
=== modified file 'live-build/auto/config'
--- live-build/auto/config	2017-11-06 12:25:57 +0000
+++ live-build/auto/config	2017-11-10 00:13:40 +0000
@@ -90,6 +90,7 @@
 PREINSTALLED=false
 PREINSTALL_POOL=
 PREINSTALL_POOL_SEEDS=
+PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
 
 CHROOT_HOOKS=
 BINARY_HOOKS=
@@ -171,9 +172,17 @@
 				exit 1
 				;;
 		esac
+		case $MODEL in
+			pc-amd64|pc-i386)
+				UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
+			*)
+				UBUNTU_IMAGE_ARGS="" ;;
+		esac
+
 		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 "----------------------------------------------------------"