From patchwork Wed Aug 24 12:50:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 11835 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 98F98C32796 for ; Wed, 24 Aug 2022 12:50:52 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web11.10401.1661345450459289636 for ; Wed, 24 Aug 2022 05:50:50 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd71.dcpf.telekom.de (fwd71.aul.t-online.de [10.223.144.97]) by mailout03.t-online.de (Postfix) with SMTP id 92EA34069 for ; Wed, 24 Aug 2022 14:50:48 +0200 (CEST) Received: from flk-MS-7C91.. ([84.163.43.62]) by fwd71.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1oQpqJ-0P0Ljt0; Wed, 24 Aug 2022 14:50:47 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv2] connman: add PACKAGECONFIG to support iwd Date: Wed, 24 Aug 2022 14:50:37 +0200 Message-Id: <20220824125037.4855-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1661345447-01452C5E-4E54EF5B/0/0 CLEAN NORMAL X-TOI-MSGID: e88bff0c-51af-4527-ba2d-5aedd264ea18 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 ; Wed, 24 Aug 2022 12:50:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169812 Signed-off-by: Markus Volk --- meta/recipes-connectivity/connman/connman.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 5880ecd5d4..4b0c8a2c9f 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -28,10 +28,15 @@ EXTRA_OECONF += "\ --enable-tools \ --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" PACKAGECONFIG ??= "wispr iptables client\ - ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wifi ${WIRELESS_DAEMON}', '', d)} \ " # If you want ConnMan to support VPN, add following statement into @@ -39,9 +44,13 @@ PACKAGECONFIG ??= "wispr iptables client\ # PACKAGECONFIG:append:pn-connman = " openvpn vpnc l2tp pptp" PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''" -PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" +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" +# iwd would be required as a runtime dependency. it is nevertheless given as a recommendation because the recipe for it +# is not included in oe-core. +PACKAGECONFIG[iwd] = "--enable-iwd,--disable-iwd,,,iwd" PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" PACKAGECONFIG[vpnc] = "--enable-vpnc --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc"