Patchwork polkit: respect systemd DISTRO_FEATURE

login
register
mail settings
Submitter Ross Burton
Date Jan. 31, 2013, 12:38 p.m.
Message ID <1359635925-27715-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/43741/
State New
Headers show

Comments

Ross Burton - Jan. 31, 2013, 12:38 p.m.
By default polkit uses systemd if it's available, which mean systemd runtime
dependencies sneaking into non-systemd builds via sstate.

Instead respect the systemd feature and enable/disable support as relevant.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/polkit/polkit_0.104.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Ross Burton - Jan. 31, 2013, 3:13 p.m.
On 31 January 2013 12:38, Ross Burton <ross.burton@intel.com> wrote:
> By default polkit uses systemd if it's available, which mean systemd runtime
> dependencies sneaking into non-systemd builds via sstate.
>
> Instead respect the systemd feature and enable/disable support as relevant.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>

Retracting this, Radu's systemd branch has a patch that isn't broken.

Ross

Patch

diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2c0aaca..37d8428 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -7,8 +7,10 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
 
 DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
 
-PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
 
 PR = "r9"