summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-07 15:16:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-15 01:53:02 +0000
commit7a80810b4bb63a1c28054c1e9e90e8d9ba3e58a3 (patch)
tree68a0dd3b962ccbbee9213c67c0c73394b5854abd /meta/recipes-extended
parent423d68e615f643c4d8a3d098e7522fb8b884c3dc (diff)
downloadpoky-7a80810b4bb63a1c28054c1e9e90e8d9ba3e58a3.tar.gz
polkit: explicitly disable systemd if we're using consolekit
(From OE-Core rev: 3a92104e1f7061296c293ac261e336e17934f8c7) Signed-off-by: Ross Burton <ross.burton@intel.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.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index ab2547b831..342fbe1c52 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -12,8 +12,9 @@ PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
12 12
13PACKAGECONFIG[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" 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 15# There is no --enable/--disable option for consolekit, so disable systemd to
16PACKAGECONFIG[consolekit] = ",,,consolekit" 16# force it. ConsoleKit is accessed via DBus, so add it to RDEPENDS.
17PACKAGECONFIG[consolekit] = "--disable-systemd,,,consolekit"
17 18
18PR = "r9" 19PR = "r9"
19 20