From 852152c52627459b1bc6ee5b3f3a8614bc7aa9e4 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 19 Apr 2023 09:13:39 +0100
Subject: [PATCH] Mark the atmel and zd1211 WiFi firmware as optional

The atmel and zd1211 WiFi modules are ancient 802.11b
modules that aren't even enabled in the kernel by
default so there's really no need to ship them by default.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 comps-f38.xml.in | 4 ++--
 comps-f39.xml.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/comps-f38.xml.in b/comps-f38.xml.in
index 6ad39de2..91fbda2d 100644
--- a/comps-f38.xml.in
+++ b/comps-f38.xml.in
@@ -2935,7 +2935,6 @@
     <packagelist>
       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>
       <packagereq type="default">amd-gpu-firmware</packagereq>
-      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">atheros-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
       <packagereq type="default">b43-openfwwf</packagereq>
@@ -2963,10 +2962,10 @@
       <packagereq type="default">nvidia-gpu-firmware</packagereq>
       <packagereq type="default">realtek-firmware</packagereq>
       <packagereq type="default">usb_modeswitch</packagereq>
-      <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
+      <packagereq type="optional">atmel-firmware</packagereq>
       <packagereq arch="aarch64" type="optional">bcm283x-firmware</packagereq>
       <packagereq arch="x86_64" type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>
@@ -2986,6 +2985,7 @@
       <packagereq type="optional">pcsc-lite-ccid</packagereq>
       <packagereq type="optional">radeontop</packagereq>
       <packagereq type="optional">wpan-tools</packagereq>
+      <packagereq type="optional">zd1211-firmware</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index 2ed8bdd7..f1dac36c 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -2935,7 +2935,6 @@
     <packagelist>
       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>
       <packagereq type="default">amd-gpu-firmware</packagereq>
-      <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">atheros-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
       <packagereq type="default">b43-openfwwf</packagereq>
@@ -2963,10 +2962,11 @@
       <packagereq type="default">nvidia-gpu-firmware</packagereq>
       <packagereq type="default">realtek-firmware</packagereq>
       <packagereq type="default">usb_modeswitch</packagereq>
-      <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">alsa-firmware</packagereq>
+      <packagereq type="optional">atmel-firmware</packagereq>
+      <packagereq type="optional">zd1211-firmware</packagereq>
       <packagereq arch="aarch64" type="optional">bcm283x-firmware</packagereq>
       <packagereq arch="x86_64" type="optional">cmospwd</packagereq>
       <packagereq type="optional">gpsd</packagereq>