From 0b9ab233e475b710390fc05f559df80b977cc9bc Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee@canonical.com>
Date: Fri, 27 Sep 2019 12:16:42 -0500
Subject: [PATCH] UBUNTU: [Debian] Remove support for producing i386 kernels

BugLink: https://bugs.launchpad.net/bugs/1845714

i386 will not be a supported architecture in eoan, so drop i386
from our kernel packaging. However, we will still be building
i386 hwe kernel based on eoan, so we will keep the configs and
other bits required for i386 in place.

Acked-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 debian.master/control.d/vars.generic    |  6 +++---
 debian.master/control.d/vars.lowlatency |  6 +++---
 debian.master/control.stub.in           | 14 +++++++-------
 debian.master/etc/getabis               |  1 -
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index 2cda0bf1e404..139a9f3135c8 100644
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -1,6 +1,6 @@
-arch="i386 amd64 armhf arm64 ppc64el s390x"
+arch="amd64 armhf arm64 ppc64el s390x"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
-bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
-provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [i386 amd64 x32]"
+bootloader="grub-pc [amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [amd64 x32] | grub [amd64 x32] | lilo [amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
+provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64 x32]"
diff --git a/debian.master/control.d/vars.lowlatency b/debian.master/control.d/vars.lowlatency
index 9849cd3144dc..08a98dbd0fc5 100644
--- a/debian.master/control.d/vars.lowlatency
+++ b/debian.master/control.d/vars.lowlatency
@@ -1,6 +1,6 @@
-arch="i386 amd64"
+arch="amd64"
 supported="Lowlatency"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
-bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo [i386 amd64 x32] | flash-kernel [armhf arm64]"
-provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [i386 amd64 x32]"
+bootloader="grub-pc [amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [amd64 x32] | grub [amd64 x32] | lilo [amd64 x32] | flash-kernel [armhf arm64]"
+provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64 x32]"
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 84219114b1d7..85a7d3412f40 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -9,7 +9,7 @@ Build-Depends:
  cpio,
  kernel-wedge,
  kmod <!stage1>,
- makedumpfile [amd64 i386] <!stage1>,
+ makedumpfile [amd64] <!stage1>,
  libelf-dev <!stage1>,
  libnewt-dev <!stage1>,
  libiberty-dev <!stage1>,
@@ -21,7 +21,7 @@ Build-Depends:
  pkg-config <!stage1>,
  flex <!stage1>,
  bison <!stage1>,
- libunwind8-dev [amd64 arm64 armhf i386 ppc64el] <!stage1>,
+ libunwind8-dev [amd64 arm64 armhf ppc64el] <!stage1>,
  liblzma-dev <!stage1>,
  openssl <!stage1>,
  libssl-dev <!stage1>,
@@ -34,10 +34,10 @@ Build-Depends:
  automake <!stage1>,
  libtool <!stage1>,
  uuid-dev <!stage1>,
- libnuma-dev [amd64 arm64 i386 ppc64el s390x] <!stage1>,
+ libnuma-dev [amd64 arm64 ppc64el s390x] <!stage1>,
  dkms <!stage1>,
  wget <!stage1>,
- lz4 [amd64 i386 s390x] <!stage1>,
+ lz4 [amd64 s390x] <!stage1>,
 Build-Depends-Indep:
  xmlto <!stage1>,
  docbook-utils <!stage1>,
@@ -104,7 +104,7 @@ Description: Header files related to Linux kernel version PKGVER
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
 Package: SRCPKGNAME-libc-dev
-Architecture: i386 amd64 armhf arm64 x32 ppc64el s390x
+Architecture: amd64 armhf arm64 x32 ppc64el s390x
 Depends: ${misc:Depends}
 Conflicts: SRCPKGNAME-kernel-headers
 Replaces: SRCPKGNAME-kernel-headers
@@ -130,7 +130,7 @@ Description: Linux kernel version specific tools for version PKGVER
 
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
-Architecture: i386 amd64 armhf arm64 ppc64el s390x
+Architecture: amd64 armhf arm64 ppc64el s390x
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
@@ -154,7 +154,7 @@ Description: Linux kernel version specific cloud tools for version PKGVER
 
 Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
-Architecture: i386 amd64 armhf
+Architecture: amd64 armhf
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common
diff --git a/debian.master/etc/getabis b/debian.master/etc/getabis
index 93efb3cc6165..ff0e3601b38e 100644
--- a/debian.master/etc/getabis
+++ b/debian.master/etc/getabis
@@ -11,7 +11,6 @@ package_prefixes linux-buildinfo
 getall armhf generic
 getall armhf generic-lpae
 getall amd64 generic lowlatency
-getall i386 generic lowlatency
 getall arm64 generic
 getall ppc64el generic
 getall s390x generic
-- 
2.39.5