diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2013-06-18 11:08:40 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:27:59 +0200 |
| commit | 692d8f036445542aa54937d64c1977252c8a4de9 (patch) | |
| tree | 9a0d019fe442e88d9c688b20af348c06518f8cd9 /meta-oe/recipes-connectivity | |
| parent | da51d044a8d9f9dd5c887dc687498fef7c326fa6 (diff) | |
| download | meta-openembedded-contrib-692d8f036445542aa54937d64c1977252c8a4de9.tar.gz | |
networkmanager: rework dependencies/configure-option and use PACKAGECONFIG
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/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 5b53f7f18b..6957f35600 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() { |