diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2017-11-13 16:04:18 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2018-01-08 12:00:41 -0500 |
commit | b55738ef8d30d6aa92e2e644a50f4b06ec541204 (patch) | |
tree | ae8bee78fdeaeccd577b4d96f5a72d5df5ea2d3f /meta-networking | |
parent | e640789577664564b56a77d470cc24aa141853a0 (diff) | |
download | meta-openembedded-b55738ef8d30d6aa92e2e644a50f4b06ec541204.tar.gz |
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>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb | 3 |
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 bfd2aada7..d5f456f37 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() { | |||
60 | } | 60 | } |
61 | 61 | ||
62 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ | 62 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ |
63 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ | 63 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ |
64 | bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ | ||
64 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 65 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
65 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ | 66 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ |
66 | " | 67 | " |