From c254dc0464eca8ab1bd15d24f838b97bccfa5d46 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Aug 14 2024 20:04:02 +0000
Subject: Consolidate linux-firmware packages


---

diff --git a/prepopulate.json b/prepopulate.json
index 5148a98..7496128 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -3268,6 +3268,11 @@
       "libzip": [
         "libzip.aarch64"
       ],
+      "linux-firmware": [
+        "amd-gpu-firmware.noarch",
+        "intel-gpu-firmware.noarch",
+        "nvidia-gpu-firmware.noarch"
+      ],
       "linuxptp": [
         "linuxptp.aarch64"
       ],
@@ -9772,6 +9777,11 @@
       "libzip": [
         "libzip.ppc64le"
       ],
+      "linux-firmware": [
+        "amd-gpu-firmware.noarch",
+        "intel-gpu-firmware.noarch",
+        "nvidia-gpu-firmware.noarch"
+      ],
       "linuxptp": [
         "linuxptp.ppc64le"
       ],
@@ -16201,6 +16211,11 @@
       "libzip": [
         "libzip.s390x"
       ],
+      "linux-firmware": [
+        "amd-gpu-firmware.noarch",
+        "intel-gpu-firmware.noarch",
+        "nvidia-gpu-firmware.noarch"
+      ],
       "linuxptp": [
         "linuxptp.s390x"
       ],
@@ -22770,6 +22785,11 @@
       "libzip": [
         "libzip.x86_64"
       ],
+      "linux-firmware": [
+        "amd-gpu-firmware.noarch",
+        "intel-gpu-firmware.noarch",
+        "nvidia-gpu-firmware.noarch"
+      ],
       "linuxptp": [
         "linuxptp.x86_64"
       ],
@@ -27053,14 +27073,12 @@
         "libyaml.aarch64"
       ],
       "linux-firmware": [
-        "amd-gpu-firmware.noarch",
         "amd-ucode-firmware.noarch",
         "atheros-firmware.noarch",
         "brcmfmac-firmware.noarch",
         "cirrus-audio-firmware.noarch",
         "dvb-firmware.noarch",
         "intel-audio-firmware.noarch",
-        "intel-gpu-firmware.noarch",
         "intel-vsc-firmware.noarch",
         "iwlegacy-firmware.noarch",
         "iwlwifi-dvm-firmware.noarch",
@@ -27072,7 +27090,6 @@
         "mrvlprestera-firmware.noarch",
         "mt7xxx-firmware.noarch",
         "netronome-firmware.noarch",
-        "nvidia-gpu-firmware.noarch",
         "nxpwireless-firmware.noarch",
         "qcom-firmware.noarch",
         "realtek-firmware.noarch",
@@ -28628,14 +28645,12 @@
         "libyaml.ppc64le"
       ],
       "linux-firmware": [
-        "amd-gpu-firmware.noarch",
         "amd-ucode-firmware.noarch",
         "atheros-firmware.noarch",
         "brcmfmac-firmware.noarch",
         "cirrus-audio-firmware.noarch",
         "dvb-firmware.noarch",
         "intel-audio-firmware.noarch",
-        "intel-gpu-firmware.noarch",
         "intel-vsc-firmware.noarch",
         "iwlegacy-firmware.noarch",
         "iwlwifi-dvm-firmware.noarch",
@@ -28647,7 +28662,6 @@
         "mrvlprestera-firmware.noarch",
         "mt7xxx-firmware.noarch",
         "netronome-firmware.noarch",
-        "nvidia-gpu-firmware.noarch",
         "nxpwireless-firmware.noarch",
         "qcom-firmware.noarch",
         "realtek-firmware.noarch",
@@ -30183,14 +30197,12 @@
         "libzfcphbaapi.s390x"
       ],
       "linux-firmware": [
-        "amd-gpu-firmware.noarch",
         "amd-ucode-firmware.noarch",
         "atheros-firmware.noarch",
         "brcmfmac-firmware.noarch",
         "cirrus-audio-firmware.noarch",
         "dvb-firmware.noarch",
         "intel-audio-firmware.noarch",
-        "intel-gpu-firmware.noarch",
         "intel-vsc-firmware.noarch",
         "iwlegacy-firmware.noarch",
         "iwlwifi-dvm-firmware.noarch",
@@ -30202,7 +30214,6 @@
         "mrvlprestera-firmware.noarch",
         "mt7xxx-firmware.noarch",
         "netronome-firmware.noarch",
-        "nvidia-gpu-firmware.noarch",
         "nxpwireless-firmware.noarch",
         "qcom-firmware.noarch",
         "realtek-firmware.noarch",
@@ -31754,14 +31765,12 @@
         "libyaml.x86_64"
       ],
       "linux-firmware": [
-        "amd-gpu-firmware.noarch",
         "amd-ucode-firmware.noarch",
         "atheros-firmware.noarch",
         "brcmfmac-firmware.noarch",
         "cirrus-audio-firmware.noarch",
         "dvb-firmware.noarch",
         "intel-audio-firmware.noarch",
-        "intel-gpu-firmware.noarch",
         "intel-vsc-firmware.noarch",
         "iwlegacy-firmware.noarch",
         "iwlwifi-dvm-firmware.noarch",
@@ -31773,7 +31782,6 @@
         "mrvlprestera-firmware.noarch",
         "mt7xxx-firmware.noarch",
         "netronome-firmware.noarch",
-        "nvidia-gpu-firmware.noarch",
         "nxpwireless-firmware.noarch",
         "qcom-firmware.noarch",
         "realtek-firmware.noarch",
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 39c377b..4a1086e 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -299,9 +299,6 @@ additional_packages = [
             "valkey-devel", #ENGCMP-4149
             "tpm2-openssl", #ENGCMP-4154
             "pcm", #ENGCMP-4090
-            "amd-gpu-firmware", #ENGCMP-4150
-            "intel-gpu-firmware", #ENGCMP-4150
-            "nvidia-gpu-firmware", #ENGCMP-4150
             "pkcs11-provider", #ENGCMP-4181
             "ptyxis", #ENGCMP-4204
             "liboqs", #ENGCMP-3895