mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 17:19:23 +00:00
Code Issues Projects Releases Wiki Activity

networkmanager: rework dependencies/configure-option and use PACKAGECONFIG

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2013-06-18 11:08:40 +02:00
committed by Martin Jansa
parent da51d044a8
commit 692d8f0364
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
+9 -3
View File
@@ -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() {