From 75fb6defc1eafad13ff29a74dfd92ebf5fcfa256 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 1 Jan 2019 15:19:02 -0500
Subject: [PATCH] Put all firmware into extra-image rather than a hand picked
 set

---
 .../images/citadel-extra-image.bb             |  2 +-
 .../packagegroups/packagegroup-firmware.bb    | 45 -------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 meta-citadel/recipes-citadel/packagegroups/packagegroup-firmware.bb

diff --git a/meta-citadel/recipes-citadel/images/citadel-extra-image.bb b/meta-citadel/recipes-citadel/images/citadel-extra-image.bb
index 3420e7b..2b1d7e1 100644
--- a/meta-citadel/recipes-citadel/images/citadel-extra-image.bb
+++ b/meta-citadel/recipes-citadel/images/citadel-extra-image.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Citadel resources"
 LICENSE = "MIT"
 
 PACKAGE_INSTALL = "\
-    packagegroup-firmware \
+    linux-firmware \
     adapta-gtk-theme \
     paper-icon-theme \
     gnome-backgrounds \
diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-firmware.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-firmware.bb
deleted file mode 100644
index 23edd8c..0000000
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-firmware.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-inherit packagegroup
-
-RDEPENDS_${PN} = "\
-    linux-firmware-ath9k \
-    linux-firmware-ath10k \
-    linux-firmware-bcm4329 \
-    linux-firmware-bcm4330 \
-    linux-firmware-bcm4334 \
-    linux-firmware-bcm4339 \
-    linux-firmware-bcm4354 \
-    linux-firmware-bcm43340 \
-    linux-firmware-bcm43362 \
-    linux-firmware-bcm43430 \
-    linux-firmware-bnx2-mips \
-    linux-firmware-carl9170 \
-    linux-firmware-i915 \
-    linux-firmware-ibt-11-5 \
-    linux-firmware-ibt-12-16 \
-    linux-firmware-ibt-hw-37-7 \
-    linux-firmware-ibt-hw-37-8 \
-    linux-firmware-iwlwifi-135-6 \
-    linux-firmware-iwlwifi-3160-7 \
-    linux-firmware-iwlwifi-3160-8 \
-    linux-firmware-iwlwifi-3160-9 \
-    linux-firmware-iwlwifi-3160-10 \
-    linux-firmware-iwlwifi-3160-12 \
-    linux-firmware-iwlwifi-3160-13 \
-    linux-firmware-iwlwifi-3160-16 \
-    linux-firmware-iwlwifi-3160-17 \
-    linux-firmware-iwlwifi-6000-4 \
-    linux-firmware-iwlwifi-6000g2a-5 \
-    linux-firmware-iwlwifi-6000g2a-6 \
-    linux-firmware-iwlwifi-6000g2b-5 \
-    linux-firmware-iwlwifi-6000g2b-6 \
-    linux-firmware-iwlwifi-6050-4 \
-    linux-firmware-iwlwifi-6050-5 \
-    linux-firmware-iwlwifi-7260 \
-    linux-firmware-iwlwifi-7265 \
-    linux-firmware-iwlwifi-7265d \
-    linux-firmware-iwlwifi-8000c \
-    linux-firmware-iwlwifi-8265 \
-    linux-firmware-radeon \
-    linux-firmware-rtl8188 \
-"