From 8a33b23dd0e888bf30cba8214bb4cce0c4313f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Wed, 21 Nov 2018 21:05:21 +0100
Subject: [PATCH] Use -O instead of -o for ubuntu-image classic builds.

---
 live-build/auto/build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index 8bc034cb..03bb0f0f 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -35,9 +35,13 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 		make -C "config/$PREFIX-gadget"
 		ubuntu-image classic $UBUNTU_IMAGE_ARGS \
 			-p $PROJECT -a $ARCH --subarch $SUBARCH \
-			-o "$PREFIX".img config/$PREFIX-gadget/install
+			-O output config/$PREFIX-gadget/install
+		# XXX: currently we only have one image generated, but really
+		#  we should be supporting more than one for models that
+		#  define those.
+		mv output/*.img "$PREFIX".img
 		xz -0 -T4 "$PREFIX".img
-		mv filesystem.manifest "$PREFIX".manifest
+		mv output/filesystem.manifest "$PREFIX".manifest
 	fi
 
 	exit 0