[oe-commits] =?UTF-8?Q?Andreas=20M=C3=BCller=20?=: networkmanager: rework dependencies/ configure-option and use PACKAGECONFIG
git at git.openembedded.org
git at git.openembedded.org
Thu Jun 20 10:23:24 UTC 2013
Module: meta-openembedded.git
Branch: master
Commit: 692d8f036445542aa54937d64c1977252c8a4de9
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=692d8f036445542aa54937d64c1977252c8a4de9
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Tue Jun 18 11:08:40 2013 +0200
networkmanager: rework dependencies/configure-option and use PACKAGECONFIG
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
.../networkmanager/networkmanager_0.9.8.0.bb | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
index 5b53f7f..6957f35 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
@@ -4,8 +4,7 @@ SECTION = "net/misc"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
-DEPENDS = "libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+DEPENDS = "libnl dbus dbus-glib udev wireless-tools gnutls util-linux ppp"
inherit gnome gettext systemd
@@ -33,7 +32,14 @@ EXTRA_OECONF = " \
--with-tests \
"
-EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+PACKAGECONFIG[systemd] = " \
+ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
+ --without-systemdsystemunitdir=, \
+ polkit \
+"
+# consolekit is not picked by shlibs, so add it to RDEPENDS too
+PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
# Work around dbus permission problems since we lack a proper at_console
do_install_prepend() {
More information about the Openembedded-commits
mailing list