Patchwork polkit: Enable systemd support

login
register
mail settings
Submitter Radu Moisan
Date Feb. 1, 2013, 11:37 a.m.
Message ID <1359718670-20670-1-git-send-email-radu.moisan@intel.com>
Download mbox | patch
Permalink /patch/43813/
State Accepted
Commit b624b06c239309cc3719f7351d74c8a3f8264b0b
Headers show

Comments

Radu Moisan - Feb. 1, 2013, 11:37 a.m.
By default the polkit will autodetect if systemd is available
and setup the configuraton accordingly, potentially
contaminating sstate.
In this patch systemd is explicitly enabled/disabled.
When enabled, polkit will use systemd for session tarcking,
otherwise it will use ConsoleKit.

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/polkit/polkit_0.104.bb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Ross Burton - Feb. 1, 2013, 12:04 p.m.
On 1 February 2013 11:37, Radu Moisan <radu.moisan@intel.com> wrote:
> By default the polkit will autodetect if systemd is available
> and setup the configuraton accordingly, potentially
> contaminating sstate.
> In this patch systemd is explicitly enabled/disabled.
> When enabled, polkit will use systemd for session tarcking,
> otherwise it will use ConsoleKit.
>
> Signed-off-by: Radu Moisan <radu.moisan@intel.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Acked-by: Ross Burton <ross.burton@intel.com>

Ross

Patch

diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2c0aaca..ab2547b 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -7,8 +7,13 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
 
 DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
 
-PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                 ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
+PACKAGECONFIG[consolekit] = ",,,consolekit"
 
 PR = "r9"