Patchwork [meta-gnome/meta-oe/meta-xfce,11/15] networkmanager: rework settings/dependencies for polkit/consolekit

login
register
mail settings
Submitter Andreas Müller
Date June 11, 2013, 5:34 a.m.
Message ID <1370928876-14423-12-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/51515/
State Accepted, archived
Headers show

Comments

Andreas Müller - June 11, 2013, 5:34 a.m.
make system-wide settings available too

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../networkmanager/networkmanager_0.9.8.0.bb       |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
Khem Raj - June 11, 2013, 6:59 a.m.
On Mon, Jun 10, 2013 at 10:34 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"

intention is to have either systemd or consolekit but not both at same
time is that correct ?
Andreas Müller - June 11, 2013, 7:28 a.m.
On Tue, Jun 11, 2013 at 8:59 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Mon, Jun 10, 2013 at 10:34 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
>
> intention is to have either systemd or consolekit but not both at same
> time is that correct ?

yes - FWIW I took this one from polkit

Patch

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..ef686cf 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 --enable-modify-system, \
+    --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() {