summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-06-18 11:08:40 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-20 12:27:59 +0200
commit692d8f036445542aa54937d64c1977252c8a4de9 (patch)
tree9a0d019fe442e88d9c688b20af348c06518f8cd9
parentda51d044a8d9f9dd5c887dc687498fef7c326fa6 (diff)
downloadmeta-openembedded-692d8f036445542aa54937d64c1977252c8a4de9.tar.gz
networkmanager: rework dependencies/configure-option and use PACKAGECONFIG
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb12
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 5b53f7f18..6957f3560 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"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" 5LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
6 6
7DEPENDS = "libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp" 7DEPENDS = "libnl dbus dbus-glib udev wireless-tools gnutls util-linux ppp"
8DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
9 8
10inherit gnome gettext systemd 9inherit gnome gettext systemd
11 10
@@ -33,7 +32,14 @@ EXTRA_OECONF = " \
33 --with-tests \ 32 --with-tests \
34" 33"
35 34
36EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 35PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
36PACKAGECONFIG[systemd] = " \
37 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
38 --without-systemdsystemunitdir=, \
39 polkit \
40"
41# consolekit is not picked by shlibs, so add it to RDEPENDS too
42PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
37 43
38# Work around dbus permission problems since we lack a proper at_console 44# Work around dbus permission problems since we lack a proper at_console
39do_install_prepend() { 45do_install_prepend() {