From 64ec0793470a666d98900a0e41f0b4b963aab05a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 18 Oct 2022 16:04:26 -0400
Subject: [PATCH] Drop 32-bit ARM and x86 support

We don't build 32-bit ARM or x86 images in Fedora any more (we
stopped doing x86 images after F30, we are no longer doing 32-bit
ARM images after F36). So we can drop all of this stuff from
master branch at least.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 80-rhel/arm.tmpl               | 58 ----------------------------------
 80-rhel/live/arm.tmpl          | 52 ------------------------------
 80-rhel/live/live-install.tmpl |  7 ----
 80-rhel/live/x86.tmpl          |  6 +---
 80-rhel/runtime-install.tmpl   |  7 +---
 80-rhel/x86.tmpl               | 17 ++--------
 6 files changed, 5 insertions(+), 142 deletions(-)
 delete mode 100644 80-rhel/arm.tmpl
 delete mode 100644 80-rhel/live/arm.tmpl

diff --git a/80-rhel/arm.tmpl b/80-rhel/arm.tmpl
deleted file mode 100644
index d96e26b..0000000
--- a/80-rhel/arm.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<%page args="kernels, runtime_img, runtime_base, basearch, outroot, arch"/>
-<%
-configdir="tmp/config_files/uboot"
-PXEBOOTDIR="images/pxeboot"
-DTBDIR="images/pxeboot/dtb"
-BOOTDIR="boot"
-KERNELDIR=PXEBOOTDIR
-STAGE2IMG="images/install.img"
-LORAXDIR="usr/share/lorax/"
-
-# keep a comma-delimited list of platforms installed to add to .treeinfo
-platforms = ""
-delimiter = ''
-
-from os.path import basename
-%>
-
-mkdir images
-install ${runtime_img} ${STAGE2IMG}
-treeinfo stage2 mainimage ${STAGE2IMG}
-
-mkdir ${DTBDIR}
-install boot/dtb-*/*dtb  ${DTBDIR}/
-
-## install kernels
-mkdir ${KERNELDIR}
-%for kernel in kernels:
-    %if kernel.flavor:
-        installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
-        installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
-<%
-        platforms = platforms + delimiter + kernel.flavor
-        delimiter = ','
-%>
-    %else:
-        installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
-        installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
-    %endif
-%endfor
-
-# add platform to treeinfo for Beaker support
-treeinfo ${basearch} platforms ${platforms}
-
-# Create optional product.img and updates.img
-<% images=["product", "updates"] %>
-%for img in images:
-    %if exists("%s/%s/" % (LORAXDIR, img)):
-        installimg --xz -9 --memlimit-compress=3700MiB ${LORAXDIR}/${img}/ images/${img}.img
-        treeinfo images-${basearch} ${img}.img images/${img}.img
-    %endif
-%endfor
-
-# Add the license files
-%for f in glob("/usr/share/licenses/*-release/*"):
-    install ${f} ${f|basename}
-%endfor
-
-## FIXME: ARM may need some extra boot config
diff --git a/80-rhel/live/arm.tmpl b/80-rhel/live/arm.tmpl
deleted file mode 100644
index 30f1222..0000000
--- a/80-rhel/live/arm.tmpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<%page args="kernels, runtime_img, runtime_base, basearch, outroot, arch"/>
-<%
-configdir="tmp/config_files/uboot"
-PXEBOOTDIR="images/pxeboot"
-BOOTDIR="boot"
-KERNELDIR=PXEBOOTDIR
-LIVEDIR="LiveOS"
-LORAXDIR="usr/share/lorax/"
-
-from os.path import basename
-%>
-
-mkdir ${LIVEDIR}
-install ${runtime_img} ${LIVEDIR}/squashfs.img
-treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
-
-## install kernels
-mkdir ${KERNELDIR}
-%for kernel in kernels:
-    %if kernel.flavor:
-        installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
-        installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
-
-        treeinfo images-${kernel.flavor}-${basearch} uimage ${KERNELDIR}/uImage-${kernel.flavor}
-        treeinfo images-${kernel.flavor}-${basearch} uinitrd ${KERNELDIR}/uInitrd-${kernel.flavor}
-
-    %else:
-        installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
-        installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
-
-        treeinfo images-${basearch} uimage ${KERNELDIR}/uImage
-        treeinfo images-${basearch} uinitrd ${KERNELDIR}/uInitrd
-
-    %endif
-%endfor
-
-# Create optional product.img and updates.img
-<% images=["product", "updates"] %>
-%for img in images:
-    %if exists("%s/%s/" % (LORAXDIR, img)):
-        installimg --xz -9 --memlimit-compress=3700MiB ${LORAXDIR}/${img}/ images/${img}.img
-        treeinfo images-${basearch} ${img}.img images/${img}.img
-    %endif
-%endfor
-
-# Add the license files
-%for f in glob("/usr/share/licenses/*-release/*"):
-    install ${f} ${f|basename}
-%endfor
-
-## FIXME: ARM may need some extra boot config
-
diff --git a/80-rhel/live/live-install.tmpl b/80-rhel/live/live-install.tmpl
index 6d36bfd..ecaa183 100644
--- a/80-rhel/live/live-install.tmpl
+++ b/80-rhel/live/live-install.tmpl
@@ -6,17 +6,10 @@
     installpkg efibootmgr
     installpkg grub2-efi-aa64-cdboot shim-aa64
 %endif
-%if basearch in ("arm", "armhfp"):
-    installpkg efibootmgr
-    installpkg grub2-efi-arm-cdboot
-    installpkg uboot-tools
-%endif
 %if basearch == "x86_64":
     installpkg grub2-tools-efi
     installpkg efibootmgr
     installpkg shim-x64 grub2-efi-x64-cdboot
-%endif
-%if basearch in ("i386", "x86_64"):
     installpkg biosdevname memtest86+
     installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
     installpkg grub2-pc-modules
diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
index fc82fb0..95e02ef 100644
--- a/80-rhel/live/x86.tmpl
+++ b/80-rhel/live/x86.tmpl
@@ -65,16 +65,12 @@ replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg
 %if exists("boot/efi/EFI/*/gcdx64.efi"):
     <% efiarch64 = 'X64' %>
 %endif
-%if (efiarch32 or efiarch64) and basearch != 'i386':
+%if (efiarch32 or efiarch64):
     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args"/>
 %endif
 
 # Create optional product.img and updates.img
 <% filegraft=""; images=["product", "updates"]; compressargs=""; %>
-%if basearch == 'i386':
-    # Limit the amount of memory xz uses on i386
-    <% compressargs="--xz -9 --memlimit-compress=3700MiB" %>
-%endif
 %for img in images:
     %if exists("%s/%s/" % (LORAXDIR, img)):
         installimg ${compressargs} ${LORAXDIR}/${img}/ images/${img}.img
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index 691928a..0c01804 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -46,8 +46,6 @@ installpkg glibc-all-langpacks
     installpkg grub2-tools-efi
     installpkg efibootmgr
     installpkg shim-x64 grub2-efi-x64-cdboot
-%endif
-%if basearch in ("i386", "x86_64"):
     installpkg biosdevname memtest86+
     installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
     installpkg grub2-pc-modules
@@ -128,10 +126,7 @@ installpkg ipcalc
 installpkg pciutils usbutils ipmitool
 installpkg mt-st smartmontools
 installpkg hdparm
-%if basearch not in ("arm", "armhfp"):
-    installpkg libmlx4 rdma-core
-%endif
-%if basearch in ("i386", "x86_64", "aarch64"):
+%if basearch in ("x86_64", "aarch64"):
 installpkg dmidecode
 %endif
 installpkg nvme-cli
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
index 07f800b..d95d506 100644
--- a/80-rhel/x86.tmpl
+++ b/80-rhel/x86.tmpl
@@ -31,15 +31,8 @@ treeinfo stage2 mainimage images/${runtime_base}
 ## install kernels
 mkdir ${KERNELDIR}
 %for kernel in kernels:
-    %if kernel.flavor:
-        ## i386 PAE
-        installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
-        installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
-    %else:
-        ## normal i386, x86_64
-        installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
-        installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
-    %endif
+    installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
+    installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
 %endfor
 
 %if basearch == 'x86_64':
@@ -66,16 +59,12 @@ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg
 %if exists("boot/efi/EFI/*/gcdx64.efi"):
     <% efiarch64 = 'X64' %>
 %endif
-%if (efiarch32 or efiarch64) and basearch != 'i386':
+%if (efiarch32 or efiarch64):
     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
 %endif
 
 # Create optional product.img and updates.img
 <% filegraft=""; images=["product", "updates"]; compressargs=""; %>
-%if basearch == 'i386':
-    # Limit the amount of memory xz uses on i386
-    <% compressargs="--xz -9 --memlimit-compress=3700MiB" %>
-%endif
 %for img in images:
     %if exists("%s/%s/" % (LORAXDIR, img)):
         installimg ${compressargs} ${LORAXDIR}/${img}/ images/${img}.img