Merge lp:~sil2100/livecd-rootfs/xenial-ui-support-and-core-suite into lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed

[Łukasz Zemczak]

Backporting core support to xenial + selecting core series per suite.

One possible proposition: backporting core support to xenial + selecting core series per suite.

[lp:~sil2100/livecd-rootfs/xenial-ui-support-and-core-suite]

1468. By Łukasz Zemczak on 2018-10-04

Missing dep

1469. By Łukasz Zemczak on 2018-10-10

The model assertions for 18 don't actually use series=18 because that would be too logical.

1470. By Łukasz Zemczak on 2018-10-11

For the pc model, the name changed so we need to special case it a bit.

1471. By Łukasz Zemczak on 2018-10-24

Merge trunk.

1472. By Łukasz Zemczak on 2018-10-24

Add bug to changelog.

[Mathieu Trudel-Lapierre (cyphermox)]

Isn't the:

touch .build/config

Place wrong? Won't it make it so build won't run at all, so you wouldn't run ubuntu-image? Seems like it should be just before the return in auto/build instead?

review: Needs Information

[Steve Langasek (vorlon)]

review: Needs Fixing

[Łukasz Zemczak (sil2100)]

Fixing the assignment move.

[lp:~sil2100/livecd-rootfs/xenial-ui-support-and-core-suite]

1473. By Łukasz Zemczak on 2018-10-29

As Steve pointed out, the auto/build PREFIX change was a move, not an addition.

[Steve Langasek (vorlon)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-10-10 16:09:19 +0000
+++ debian/changelog	2018-10-29 16:57:59 +0000
@@ -1,3 +1,13 @@
+livecd-rootfs (2.408.39) UNRELEASED; urgency=medium
+
+  * Backport support for building ubuntu-core images with ubuntu-image (using
+    IMAGEFORMAT=ubuntu-image).
+  * Decide what model assertion series to fetch depending on the suite. Use 16
+    for xenial and 18 for other series (bionic+). This enables core18 image
+    builds (LP: #1799736).
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Thu, 04 Oct 2018 19:30:17 +0200
+
 livecd-rootfs (2.408.38) xenial; urgency=medium
 
   * ubuntu-cpc: Handle a pre-existing /lib/modules in 030-root-tarball.hook

=== modified file 'debian/control'
--- debian/control	2018-06-07 21:54:23 +0000
+++ debian/control	2018-10-29 16:57:59 +0000
@@ -30,7 +30,9 @@
          python3-software-properties,
          qemu-utils,
          rsync,
+         snapd,
          squashfs-tools (>= 1:3.3-1),
+         ubuntu-image,
          vmdk-stream-converter [amd64 i386],
          xz-utils,
          zerofree

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-07-02 21:43:35 +0000
+++ live-build/auto/build	2018-10-29 16:57:59 +0000
@@ -10,6 +10,28 @@
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
+if [ -z "${PROJECT:-}" ]; then
+    echo "PROJECT environment variable has to be set" >&2
+    exit 1
+fi
+
+. config/functions
+
+# 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
+
+	CHANNEL="${CHANNEL:-edge}"
+	env SNAPPY_STORE_NO_CDN=1 \
+	ubuntu-image -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \
+		-o "$PREFIX".img "$PREFIX".model-assertion
+	xz -0 -T4 "$PREFIX".img
+	mv seed.manifest "$PREFIX".manifest
+	exit 0
+fi
+
 # Setup cleanup function
 Setup_cleanup
 
@@ -350,9 +372,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	2018-06-08 16:12:22 +0000
+++ live-build/auto/config	2018-10-29 16:57:59 +0000
@@ -96,6 +96,7 @@
 PREINSTALLED=false
 PREINSTALL_POOL=
 PREINSTALL_POOL_SEEDS=
+PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
 
 CHROOT_HOOKS=
 BINARY_HOOKS=
@@ -144,6 +145,53 @@
 		PREINSTALLED=true
 		;;
 
+	ubuntu-image)
+		case "$ARCH+${SUBARCH:-}" in
+			amd64+*)
+				MODEL=pc-amd64 ;;
+			i386+*)
+				MODEL=pc-i386 ;;
+			arm64+snapdragon)
+				MODEL=dragonboard ;;
+			armhf+raspi2)
+				MODEL=pi2 ;;
+			armhf+raspi3)
+				MODEL=pi3 ;;
+			armhf+cm3)
+				MODEL=cm3 ;;
+			*)
+				echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
+				exit 1
+				;;
+		esac
+		case $MODEL in
+			pc-amd64|pc-i386)
+				UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
+			*)
+				UBUNTU_IMAGE_ARGS="" ;;
+		esac
+		case $SUITE in
+			xenial)
+				# Ubuntu Core 16
+				;;
+			*)
+				# Ubuntu Core 18
+				MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
+		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 > "$PREFIX".model-assertion
+		echo "Configured ubuntu-image for the following model assertion:"
+		cat "$PREFIX".model-assertion
+		echo "----------------------------------------------------------"
+		# Fake finished configuration for lb build
+		mkdir -p .build
+		touch .build/config
+		exit 0
+		;;
+
 	none)
 		OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT"
 		;;