From 18b570ea039b3e471b90423e7655e6d6c30ba905 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 13 Nov 2017 16:04:18 +0800 Subject: networkmanager: add consolekit only when x11 is enabled consolekit depends on virtual/libx11 then it requires x11 distro feature, so add consolekit option only when x11 is in DISTRO_FEATURES. Signed-off-by: Jackie Huang Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald (cherry picked from commit b55738ef8d30d6aa92e2e644a50f4b06ec541204) Signed-off-by: Armin Kuster --- .../recipes-connectivity/networkmanager/networkmanager_1.4.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb index bfd2aada74..d5f456f37b 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb @@ -60,7 +60,8 @@ do_compile_prepend() { } PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ " -- cgit 1.2.3-korg