mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-14 03:57:15 +00:00
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 <jkeeping@inmusicbrands.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
1 parent
6f6f17f892
commit
e1b33084dd
1 file changed
+4
@@ -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)}
|
||||
|
||||
Reference in new issue
Block a user