qcacld: Fix missing firmware and tools packages

The RDEPENDS from kernel-module-qca* is not working, so that firmware-qca*
and qca-tools are missing from the image. Use a packagegroup instead
as a workaround.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

6 files changed, 24 insertions, 8 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b3553c643..5f19e0436 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -212,8 +212,8 @@ MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES',
 MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}"
 
 # Extra QCA Wi-Fi & BTE driver and firmware
-MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'kernel-module-qca6174', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'kernel-module-qca9377', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}"
 
 # Extra udev rules
 MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-qca6174.bb b/recipes-fsl/packagegroups/packagegroup-fsl-qca6174.bb
new file mode 100644
index 000000000..ee96609b4
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-qca6174.bb
@@ -0,0 +1,11 @@
+# Copyright 2019 NXP
+
+SUMMARY = "Qualcomm Wi-Fi support"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = " \
+    kernel-module-qca6174 \
+    firmware-qca6174 \
+    qca-tools \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-qca9377.bb b/recipes-fsl/packagegroups/packagegroup-fsl-qca9377.bb
new file mode 100644
index 000000000..109b9461c
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-qca9377.bb
@@ -0,0 +1,11 @@
+# Copyright 2019 NXP
+
+SUMMARY = "Qualcomm Wi-Fi support"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = " \
+    kernel-module-qca9377 \
+    firmware-qca9377 \
+    qca-tools \
+"
diff --git a/recipes-kernel/kernel-modules/kernel-module-qca6174_2.0.bb b/recipes-kernel/kernel-modules/kernel-module-qca6174_2.0.bb
index 3bc181243..6da4c1d85 100644
--- a/recipes-kernel/kernel-modules/kernel-module-qca6174_2.0.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-qca6174_2.0.bb
@@ -11,5 +11,3 @@ EXTRA_OEMAKE += " \
     CONFIG_WLAN_WAPI_MODE_11AC_DISABLE=y \
     MODNAME=qca6174 \
 "
-
-RDEPENDS_${PN} += "firmware-qca6174"
diff --git a/recipes-kernel/kernel-modules/kernel-module-qca9377_2.0.bb b/recipes-kernel/kernel-modules/kernel-module-qca9377_2.0.bb
index fbc87ea26..da7a440b0 100644
--- a/recipes-kernel/kernel-modules/kernel-module-qca9377_2.0.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-qca9377_2.0.bb
@@ -13,5 +13,3 @@ EXTRA_OEMAKE += " \
     MODNAME=qca9377 \
     SAP_AUTH_OFFLOAD=1 \
 "
-
-RDEPENDS_${PN} += "firmware-qca9377"
diff --git a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
index b2aa75992..ea205a221 100644
--- a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
@@ -20,5 +20,3 @@ EXTRA_OEMAKE += " \
     CONFIG_PMF_SUPPORT=y \
     TARGET_BUILD_VARIANT=user \
 "
-
-RDEPENDS_${PN} = "qca-tools"