From d5c49b973149557cf2aff6f3c27041bb19d8062e Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Tue, 6 Aug 2024 14:00:53 +0100
Subject: [PATCH] Drop gfs2-utils

gfs2 is being removed in RHEL 10

Signed-off-by: Andrew Price <anprice@redhat.com>
---
 configs/sst_filesystems-userspace-unwanted.yaml |  6 ++----
 configs/sst_filesystems-userspace.yaml          | 10 ----------
 configs/sst_program-lorax-template.yaml         |  3 ---
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/configs/sst_filesystems-userspace-unwanted.yaml b/configs/sst_filesystems-userspace-unwanted.yaml
index 1b3d3b205..5e926104f 100644
--- a/configs/sst_filesystems-userspace-unwanted.yaml
+++ b/configs/sst_filesystems-userspace-unwanted.yaml
@@ -11,10 +11,8 @@ data:
     - luarocks
     - leveldb
     - fmt
-  unwanted_arch_packages:
-    aarch64:
-      - gfs2-utils
-      - pcp-pmda-gfs2
+    - gfs2-utils
+    - pcp-pmda-gfs2
   labels:
     - eln
     - c10s
diff --git a/configs/sst_filesystems-userspace.yaml b/configs/sst_filesystems-userspace.yaml
index cddd0236e..a045c0a82 100644
--- a/configs/sst_filesystems-userspace.yaml
+++ b/configs/sst_filesystems-userspace.yaml
@@ -46,16 +46,6 @@ data:
     - xfsdump
     - xfsprogs
     - xfsprogs-xfs_scrub
-  arch_packages:
-    # gfs2 packages are not supported on aarch64.
-    # aarch64:
-    # - gfs2-utils
-    ppc64le:
-      - gfs2-utils
-    s390x:
-      - gfs2-utils
-    x86_64:
-      - gfs2-utils
   labels:
     - eln
     - c10s
diff --git a/configs/sst_program-lorax-template.yaml b/configs/sst_program-lorax-template.yaml
index f4889c90f..4945319fa 100644
--- a/configs/sst_program-lorax-template.yaml
+++ b/configs/sst_program-lorax-template.yaml
@@ -113,7 +113,6 @@ data:
       - iwl7260-firmware
       - libibverbs
       - rdma-core
-      - gfs2-utils
     ppc64le:
       - powerpc-utils
       - lsvpd
@@ -125,7 +124,6 @@ data:
       - linux-firmware
       - libibverbs
       - rdma-core
-      - gfs2-utils
     aarch64:
       - efibootmgr
       - grub2-efi-aa64-cdboot
@@ -142,7 +140,6 @@ data:
       - s390utils-hmcdrvfs
       - libibverbs
       - rdma-core
-      - gfs2-utils
   package_placeholders:
     - srpm_name: redhat-release
       rpms: