summaryrefslogtreecommitdiff
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:52:53 +0000
commit3a92104e1f7061296c293ac261e336e17934f8c7 (patch)
tree3a6f1bb15f418d77144ba47b3689f0bb5ec4cc56
parent87fe717009fb2bcd8e5dbdf0236fe715effca89f (diff)
downloadopenembedded-core-3a92104e1f7061296c293ac261e336e17934f8c7.tar.gz
openembedded-core-3a92104e1f7061296c293ac261e336e17934f8c7.tar.bz2
openembedded-core-3a92104e1f7061296c293ac261e336e17934f8c7.zip
polkit: explicitly disable systemd if we're using consolekit
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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)} \
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"
+# There is no --enable/--disable option for consolekit, so disable systemd to
+# force it. ConsoleKit is accessed via DBus, so add it to RDEPENDS.
+PACKAGECONFIG[consolekit] = "--disable-systemd,,,consolekit"
PR = "r9"