aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2017-11-13 16:04:18 +0800
committerArmin Kuster <akuster808@gmail.com>2018-02-01 07:32:05 -0800
commit18b570ea039b3e471b90423e7655e6d6c30ba905 (patch)
tree0fdde366d8be34e633c2eed4fffc231259847f52
parentfc88b638ec3f2c9fb4389f08069ed31f9a67eff7 (diff)
downloadmeta-openembedded-contrib-18b570ea039b3e471b90423e7655e6d6c30ba905.tar.gz
meta-openembedded-contrib-18b570ea039b3e471b90423e7655e6d6c30ba905.tar.bz2
meta-openembedded-contrib-18b570ea039b3e471b90423e7655e6d6c30ba905.zip
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 <jackie.huang@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> (cherry picked from commit b55738ef8d30d6aa92e2e644a50f4b06ec541204) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb3
1 files changed, 2 insertions, 1 deletions
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)} \
"