[oe-commits] [meta-openembedded] 34/36: networkmanager: add consolekit only when x11 is enabled
git at git.openembedded.org
git at git.openembedded.org
Thu Feb 1 16:01:52 UTC 2018
This is an automated email from the git hooks/post-receive script.
armin_kuster pushed a commit to branch rocko
in repository meta-openembedded.
commit 18b570ea039b3e471b90423e7655e6d6c30ba905
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Mon Nov 13 16:04:18 2017 +0800
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 at windriver.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
(cherry picked from commit b55738ef8d30d6aa92e2e644a50f4b06ec541204)
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
.../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 bfd2aad..d5f456f 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)} \
"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list