From 3335e6bd8ebe2eaf625d2d1c5bc7f0e22f7b9633 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Mon, 3 Jun 2019 17:00:06 +0000
Subject: [PATCH] Imported 2.589

No reason for CPC update specified.
---
 debian/changelog       |  6 ++++++
 live-build/auto/config | 19 +++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6b00ab8..924dc2b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.589) eoan; urgency=medium
+
+  * Add support for the 'kassel' subflavor of UC18 images.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 31 May 2019 01:41:13 -0700
+
 livecd-rootfs (2.588) eoan; urgency=medium
 
   * Add an explicit build-dependency on python3-yaml since livecd-rootfs
diff --git a/live-build/auto/config b/live-build/auto/config
index 46246ebb..70b4a420 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -332,6 +332,7 @@ case $IMAGEFORMAT in
 		;;
 
 	ubuntu-image)
+		UBUNTU_IMAGE_ARGS=""
 		case "$ARCH+${SUBARCH:-}" in
 			amd64+*)
 				MODEL=pc-amd64 ;;
@@ -355,12 +356,14 @@ case $IMAGEFORMAT in
 
 		if [ $PROJECT = "ubuntu-core" ]; then
 			# snap-based core images
+			EXTRA_SNAPS=""
 
 			case $MODEL in
 				pc-amd64|pc-i386)
-					UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
-				*)
-					UBUNTU_IMAGE_ARGS="" ;;
+					[ -z "${SUBARCH:-}" ] \
+					&& UBUNTU_IMAGE_ARGS="--image-size 3700M"
+					;;
+				*) ;;
 			esac
 			case $SUITE in
 				xenial)
@@ -371,6 +374,15 @@ case $IMAGEFORMAT in
 					MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
 			esac
 
+			case "$ARCH+${SUBARCH:-}" in
+				amd64+kassel)
+					EXTRA_SNAPS="core bluez alsa-utils pulseaudio udisks2"
+					;;
+				*) ;;
+			esac
+			for snap in $EXTRA_SNAPS; do
+				UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap"
+			done
 			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
@@ -387,7 +399,6 @@ case $IMAGEFORMAT in
 					MODEL=pi3 ;;
 			esac
 
-			UBUNTU_IMAGE_ARGS=""
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"