From 346327273663667a1057acfe782e993e28cf05cb Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 7 Mar 2019 18:40:31 -0600 Subject: [PATCH] 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 --- conf/machine/include/imx-base.inc | 4 ++-- recipes-fsl/packagegroups/packagegroup-fsl-qca6174.bb | 11 +++++++++++ recipes-fsl/packagegroups/packagegroup-fsl-qca9377.bb | 11 +++++++++++ .../kernel-modules/kernel-module-qca6174_2.0.bb | 2 -- .../kernel-modules/kernel-module-qca9377_2.0.bb | 2 -- .../kernel-modules/kernel-module-qcacld-lea.inc | 2 -- 6 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-qca6174.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-qca9377.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index b3553c64..5f19e043 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 00000000..ee96609b --- /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 00000000..109b9461 --- /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 3bc18124..6da4c1d8 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 fbc87ea2..da7a440b 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 b2aa7599..ea205a22 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" -- 2.40.1