From 96c2b2f759a422a827c1e31db78fb66aa931c9fb Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 15 Jun 2020 20:03:29 +0200 Subject: [PATCH] wireless: rework regulatory domain dependencies depending on the platform Starting with Linux v4.15, regulatory domains are no longer handled via CRDA, but via the kernel and a flexible database instead. Said database is included in the wireless-regdb-static package, which conflicts with the old wireless-regdb package. To accomodate for this new package, add CRDA as a dependency for ccimx6 platforms only, and incorporate wireless-regdb-static for the rest of the platforms. Additionally, the ccimx6 kernel should inherit the kernel_wireless_regdb .bbclass so the plaintext database is copied to the kernel sources, but since we use the same recipe for all kernel versions and ccimx6 platforms are not yet supported in zeus, omit this change for now. Remove the package-base .bbappend, since only ccimx6ulstarter images include that packagegroup and they require wireless-regdb-static, anyway. By adding the regulatory database, we avoid delays when going to suspend, caused by the kernel waiting for the database to appear. https://jira.digi.com/browse/DEL-7133 Signed-off-by: Gabriel Valcazar --- .../recipes-core/packagegroup/packagegroup-base.bbappend | 4 ---- .../packagegroups/packagegroup-dey-wireless.bb | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend diff --git a/meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend b/meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend deleted file mode 100644 index 4b6196654..000000000 --- a/meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (C) 2020 Digi International. - -# wireless-regdb-static conflicts with wireless-regdb required by crda -RDEPENDS_packagegroup-base-wifi_remove = "wireless-regdb-static" diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index 369d627c4..c3ec1f8a8 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -7,12 +7,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup RDEPENDS_${PN} = "\ - crda \ hostapd \ iw \ + wireless-regdb-static \ wpa-supplicant \ wpa-supplicant-cli \ wpa-supplicant-passphrase \ " RDEPENDS_${PN}_remove_ccimx6sbc = "hostapd" +RDEPENDS_${PN}_remove_ccimx6 = "wireless-regdb-static" +RDEPENDS_${PN}_append_ccimx6 = " crda"