From e1b33084dd4ca0f2186980394e580dee33c29629 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Thu, 12 Nov 2026 13:05:26 +0000 Subject: [PATCH] networkmanager: respect WIRELESS_DAEMON Use the standard WIRELESS_DAEMON variable in the same way as recipes in oe-core so that networkmanager will automatically use iwd or wpa-supplicant depending on which is selected globally. This avoids installing two different wireless daemons as rdepends of networkmanager and packagegroup-base-wifi. Signed-off-by: John Keeping Signed-off-by: Khem Raj --- .../networkmanager/networkmanager_1.58.1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.58.1.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.58.1.bb index c2c42fec01..22fa37879c 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.58.1.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.58.1.bb @@ -70,12 +70,16 @@ EXTRA_OEMESON = "\ -Dman=false \ " +# Select either wpa-supplicant or iwd +WIRELESS_DAEMON ??= "wpa-supplicant" + PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit ppp', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', bb.utils.filter('WIRELESS_DAEMON', 'iwd', d), '', d)} \ " inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)}