From patchwork Tue Aug 30 13:52:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 12118 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAF82ECAAD4 for ; Tue, 30 Aug 2022 13:52:24 +0000 (UTC) Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by mx.groups.io with SMTP id smtpd.web08.11825.1661867542010996999 for ; Tue, 30 Aug 2022 06:52:22 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.21, mailfrom: f_l_k@t-online.de) Received: from fwd74.dcpf.telekom.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout10.t-online.de (Postfix) with SMTP id 06C9BEEAB for ; Tue, 30 Aug 2022 15:52:19 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.39.244]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1oT1f8-0dv7DN0; Tue, 30 Aug 2022 15:52:18 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv2] packagegroup-base.bb: add a configure option to set the wireless-daemon Date: Tue, 30 Aug 2022 15:52:05 +0200 Message-Id: <20220830135205.22555-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1661867538-0144CE29-6260992A/0/0 CLEAN NORMAL X-TOI-MSGID: ac2b33a7-281c-431b-86ec-ed44862602b3 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 30 Aug 2022 13:52:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170071 Possible options would be wpa-supplicant or iwd. iwd is a wireless daemon written by intel and supported by all major network managers. It can be run in standalone mode and configured with 'iwctl' from the terminal, and with 'iwgtk' or 'iwdgui' from the gui. It can also work as a wpa_supplicant drop-in replacement for network-manager, connman or systemd-networkd. iwd makes heavy use of the kernel api, so it is not portable but does not need additional external libraries like openssl. The PACKAGECONFIG name for wpa-supplicant in the connman recipe is changed accordingly, so that it also works there when WIRELESS_DAEMON is set globally. Signed-off-by: Markus Volk --- meta/recipes-connectivity/connman/connman.inc | 8 ++++---- meta/recipes-core/packagegroups/packagegroup-base.bb | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 9a518cdb2b..d7af94f792 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -29,9 +29,9 @@ EXTRA_OECONF += "\ --disable-polkit \ " # For smooth operation it would be best to start only one wireless daemon at a time. -# If wpa_supplicant is running, connman will use it preferentially. -# Select either wpa_supplicant or iwd -WIRELESS_DAEMON ??= "wpa_supplicant" +# If wpa-supplicant is running, connman will use it preferentially. +# Select either wpa-supplicant or iwd +WIRELESS_DAEMON ??= "wpa-supplicant" PACKAGECONFIG ??= "wispr iptables client\ ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd', d)} \ @@ -47,7 +47,7 @@ PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/ --wit PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi" PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5, bluez5" PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" -PACKAGECONFIG[wpa_supplicant] = ",,wpa-supplicant,wpa-supplicant" +PACKAGECONFIG[wpa-supplicant] = ",,wpa-supplicant,wpa-supplicant" PACKAGECONFIG[iwd] = "--enable-iwd,--disable-iwd,,iwd" PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 7489ef61b0..d60e177471 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -267,11 +267,14 @@ RRECOMMENDS:packagegroup-base-ipsec = "\ # packagegroup-base-wifi contain everything needed to get WiFi working # WEP/WPA connection needs to be supported out-of-box # +# Choose either 'wpa-supplicant' or 'iwd' as wireless-daemon +WIRELESS_DAEMON ??= "wpa-supplicant" SUMMARY:packagegroup-base-wifi = "WiFi support" RDEPENDS:packagegroup-base-wifi = "\ iw \ wireless-regdb-static \ - wpa-supplicant" + ${WIRELESS_DAEMON} \ +" RRECOMMENDS:packagegroup-base-wifi = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \