[oe-commits] Ross Burton : polkit: explicitly disable systemd if we're using consolekit

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 3a92104e1f7061296c293ac261e336e17934f8c7
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3a92104e1f7061296c293ac261e336e17934f8c7

Author: Ross Burton <ross.burton at intel.com>
Date:   Thu Mar  7 15:16:50 2013 +0000

polkit: explicitly disable systemd if we're using consolekit

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-extended/polkit/polkit_0.104.bb |    5 +++--
 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 ab2547b..342fbe1 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"