summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-02-01 13:38:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-04 13:18:27 +0000
commitb624b06c239309cc3719f7351d74c8a3f8264b0b (patch)
tree793fcc0960e0f5ab7a1cf83fb6a643b9c729eb7d /meta/recipes-extended
parentd43cb494c1bdcbbf4f6e670432d68a9a21d060bc (diff)
downloadpoky-b624b06c239309cc3719f7351d74c8a3f8264b0b.tar.gz
polkit: Enable systemd support
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. (From OE-Core rev: 67c13656343d55ae9d1c79dcace5c79004c4c186) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/polkit/polkit_0.104.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2c0aacaac3..ab2547b831 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 \
7 7
8DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub" 8DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
9 9
10PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 10PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
11 ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
12
11PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" 13PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
14PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
15# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
16PACKAGECONFIG[consolekit] = ",,,consolekit"
12 17
13PR = "r9" 18PR = "r9"
14 19