From e7a179405510b8e682130fa92be0e8e8cc8c3a1d Mon Sep 17 00:00:00 2001
From: Ian McInerney <ian.s.mcinerney@ieee.org>
Date: Thu, 25 Jun 2020 23:11:24 +0100
Subject: [PATCH] Remove legacy i686/i386 arch tags

i686 is no longer shipped in any repos as of F31.
---
 check-missing    |  4 ++--
 comps-f33.xml.in | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/check-missing b/check-missing
index d7ef4e40..b09d3d51 100755
--- a/check-missing
+++ b/check-missing
@@ -11,7 +11,7 @@ import glob
 import subprocess
 import xml.etree.ElementTree as ET
 
-ARCHES = ('aarch64', 'armv7hl', 'i686', 'ppc64le', 's390x', 'x86_64')
+ARCHES = ('aarch64', 'armv7hl', 'ppc64le', 's390x', 'x86_64')
 
 # gather package lists. this eats lots of RAM. I don't care.
 pkgs = {}
@@ -31,7 +31,7 @@ for pkgreq in pkgreqs:
     # list of arches the package is missing on
     missing = []
     # arches the package is listed for (if no 'arch' key, it's listed for all)
-    reqarches = pkgreq.get('arch', '').replace('armhfp', 'armv7hl').replace('i386', 'i686').replace('ppc64,','')
+    reqarches = pkgreq.get('arch', '').replace('armhfp', 'armv7hl').replace('ppc64,','')
     if reqarches:
         reqarches = reqarches.split(',')
     else:
diff --git a/comps-f33.xml.in b/comps-f33.xml.in
index 4c68db50..010b8a87 100644
--- a/comps-f33.xml.in
+++ b/comps-f33.xml.in
@@ -75,12 +75,12 @@
       <packagereq arch="x86_64" type="mandatory">grub2-efi-ia32-cdboot</packagereq>
       <packagereq arch="x86_64" type="mandatory">grub2-efi-x64</packagereq>
       <packagereq arch="x86_64" type="mandatory">grub2-efi-x64-cdboot</packagereq>
-      <packagereq arch="i386,x86_64" type="mandatory">grub2-pc</packagereq>
+      <packagereq arch="x86_64" type="mandatory">grub2-pc</packagereq>
       <packagereq arch="ppc64" type="mandatory">grub2-ppc64</packagereq>
       <packagereq arch="ppc64le" type="mandatory">grub2-ppc64le</packagereq>
-      <packagereq arch="aarch64,armhfp,i686,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq>
+      <packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq>
       <packagereq arch="aarch64,armhfp,x86_64" type="mandatory">grub2-tools-efi</packagereq>
-      <packagereq arch="aarch64,armhfp,i686,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq>
+      <packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq>
       <packagereq type="mandatory">hfsplus-tools</packagereq>
       <packagereq type="mandatory">iscsi-initiator-utils</packagereq>
       <packagereq type="mandatory">kdump-anaconda-addon</packagereq>
@@ -95,7 +95,7 @@
       <packagereq arch="aarch64" type="mandatory">shim-aa64</packagereq>
       <packagereq arch="x86_64" type="mandatory">shim-ia32</packagereq>
       <packagereq arch="x86_64" type="mandatory">shim-x64</packagereq>
-      <packagereq arch="i386,x86_64" type="mandatory">syslinux-extlinux</packagereq>
+      <packagereq arch="x86_64" type="mandatory">syslinux-extlinux</packagereq>
       <packagereq type="mandatory">teamd</packagereq>
       <packagereq type="mandatory">xfsprogs</packagereq>
     </packagelist>
@@ -545,7 +545,7 @@
       <packagereq type="mandatory">dracut-config-generic</packagereq>
       <packagereq type="mandatory">grubby</packagereq>
       <packagereq type="mandatory">rsync</packagereq>
-      <packagereq arch="i386,x86_64" type="mandatory">syslinux-extlinux</packagereq>
+      <packagereq arch="x86_64" type="mandatory">syslinux-extlinux</packagereq>
       <packagereq type="mandatory">tar</packagereq>
       <packagereq type="default">fedora-release-cloud</packagereq>
       <packagereq type="default">console-login-helper-messages-issuegen</packagereq>