From d8704008514ce4524ce32c3618226ebbca53943a Mon Sep 17 00:00:00 2001
From: Robert C Jennings <robert.jennings@canonical.com>
Date: Thu, 25 May 2017 20:35:22 -0500
Subject: [PATCH] ubuntu-cpc: Produce OVA files for i386 cloud builds
---
debian/changelog | 7 +++++++
.../hooks/041-vmdk-ova-image.binary | 19 +++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aa784239..55d56e26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.209.6) trusty; urgency=medium
+
+ [Daniel Watkins]
+ * Produce OVA files for i386 cloud builds.
+
+ -- Robert C Jennings <robert.jennings@canonical.com> Tue, 23 May 2017 20:34:47 -0500
+
livecd-rootfs (2.209.5) trusty; urgency=medium
[Ben Howard]
diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
index 84134c42..4123a501 100644
--- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
+++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
@@ -9,20 +9,23 @@
#
# For this step, we re-use the VMDK's made in 040-vmdk-image.binary
+architecture=$(chroot chroot dpkg --print-architecture)
+
+case ${architecture} in
+ amd64|i386) ;;
+ *) echo "OVA images are not supported for ${architecture} yet.";
+ exit 0;;
+esac
cur_d=${PWD}
my_d=$(dirname $(readlink -f ${0}))
-architecture=$(chroot chroot dpkg --print-architecture)
-
base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
-case ${architecture} in
- amd64) base_vmdk="livecd.ubuntu-cpc.uefi.vmdk";;
- *) echo "OVA images are not supported for ${architecture} yet.";
- exit 0;;
-esac
+if [ $architecture = "amd64" ]; then
+ base_vmdk="livecd.ubuntu-cpc.uefi.vmdk"
+fi
if [ ! -e ${base_vmdk} ]; then
- find . | grep vmdk
+ find . | grep vmdk
exit 0
fi