From 7a80810b4bb63a1c28054c1e9e90e8d9ba3e58a3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 7 Mar 2013 15:16:50 +0000 Subject: polkit: explicitly disable systemd if we're using consolekit (From OE-Core rev: 3a92104e1f7061296c293ac261e336e17934f8c7) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-extended/polkit/polkit_0.104.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended') 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" -- cgit v1.2.3-54-g00ecf