Patchwork [02/12] polkit: explicitly disable systemd if we're using consolekit

login
register
mail settings
Submitter Ross Burton
Date March 11, 2013, 6:24 p.m.
Message ID <ba851d0aa397becbc7778a3b5394e34a4ee1cb2b.1363025917.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/45959/
State Accepted
Commit 7a80810b4bb63a1c28054c1e9e90e8d9ba3e58a3
Headers show

Comments

Ross Burton - March 11, 2013, 6:24 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/polkit/polkit_0.104.bb |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

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"