Merge lp:~sil2100/livecd-rootfs/bionic-core-series-per-suite into lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed

[Łukasz Zemczak]

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. Backported from cosmic.

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. Backported from cosmic.

NOTE: Please only merge/release this once we have the core16-build support released in xenial. Currently not having this in bionic enables a window for us to build core16 images (since cosmic is core18-only).

[Balint Reczey (rbalint)]

The target Bazaar branch is not active anymore.
Please resubmit the merge proposal against https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/bionic .

[Simon Quigley (tsimonq2)]

Updating the status to reflect Balint's comment.

review: Needs Resubmitting

[Steve Langasek (vorlon)]

this has been merged in git.

=== modified file 'debian/changelog'
--- debian/changelog	2018-10-26 21:01:17 +0000
+++ debian/changelog	2018-10-29 17:09:45 +0000
@@ -1,8 +1,14 @@
 livecd-rootfs (2.525.10) UNRELEASED; urgency=medium
 
+  [ Steve Langasek ]
   * Fix Vcs-Bzr link.
 
- -- Steve Langasek <[e-mail]>  Fri, 26 Oct 2018 15:01:07 -0600
+  [ Łukasz 'sil2100' Zemczak ]
+  * 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. Backported from cosmic.
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Mon, 29 Oct 2018 18:05:55 +0100
 
 livecd-rootfs (2.525.9) bionic; urgency=medium
 
 
=== modified file 'live-build/auto/config'
--- live-build/auto/config	2018-08-27 22:32:07 +0000
+++ live-build/auto/config	2018-10-29 17:09:45 +0000
@@ -189,6 +189,14 @@
 				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