From 3b7b54098b3d623356022f67e11cc8456dc095ea Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 12 Feb 2018 11:24:49 +0000
Subject: [PATCH] Import patches-unapplied version 2.501 to
 ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 7ae099a88b73276b8da9f609fdc355469d33b01b

New changelog entries:
  * Stop building ova, vmdk, vagrant images on i386.
---
 debian/changelog                                      | 6 ++++++
 live-build/ubuntu-cpc/hooks/040-vmdk-image.binary     | 2 +-
 live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary | 4 ----
 live-build/ubuntu-cpc/hooks/042-vagrant.binary        | 4 ----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 449edae9..90970f57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.501) bionic; urgency=medium
+
+  * Stop building ova, vmdk, vagrant images on i386.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 12 Feb 2018 11:24:49 +0000
+
 livecd-rootfs (2.500) bionic; urgency=medium
 
   * Disable the snapd.refresh.timer in the live server session.
diff --git a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
index 7c2e0e54..95b1d9a3 100755
--- a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
@@ -4,7 +4,7 @@
 # Generate VMDK files
 
 case $ARCH in
-         i386|amd64) ;;
+         amd64) ;;
                   *) echo "VMDK images are not supported for $ARCH yet.";
                      exit 0;;
 esac
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 801808c0..48d77789 100755
--- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
+++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
@@ -18,10 +18,6 @@ case $ARCH in
             ovf_id=94
             ovf_os_type="ubuntu64Guest"
             ovf_desc_bits=64 ;;
-        i386)
-            ovf_id=93
-            ovf_os_type="ubuntu32Guest"
-            ovf_desc_bits=32 ;;
         *)
             echo "OVA images are not supported for $ARCH yet.";
             exit 0;;
diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index d748560c..d92b7080 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -35,10 +35,6 @@ case $ARCH in
            ovf_id=94
            ovf_os_type="ubuntu64Guest"
            ovf_desc_bits=64 ;;
-        i386)
-           ovf_id=93
-           ovf_os_type="ubuntu32Guest"
-           ovf_desc_bits=32 ;;
         *)
            echo "Vagrant images are not supported for $ARCH yet."
            exit 0;;