From: Ross Burton <ross.burton@intel.com>
Date: Thu, 7 Mar 2013 15:16:50 +0000 (+0000)
Subject: polkit: explicitly disable systemd if we're using consolekit
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a80810b4bb63a1c28054c1e9e90e8d9ba3e58a3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index ab2547b831f..342fbe1c527 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"