From 52bdf26f3907975330b2c00cd6ef2ff73510e3f2 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 13 Nov 2017 16:04:19 +0800 Subject: polkit: add consolekit only when x11 is enabled consolekit depends on virtual/libx11 then it requires x11 distro feature, so add consolekit option only when x11 is in DISTRO_FEATURES. Signed-off-by: Jackie Huang Signed-off-by: Armin Kuster (cherry picked from commit 19f0e8b40b88162483198934ac38c04d60102791) Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/polkit/polkit_0.113.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb index 326c9340e9..f34928fe3a 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb @@ -10,7 +10,9 @@ DEPENDS = "expat glib-2.0 intltool-native mozjs" inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + " PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" -- cgit 1.2.3-korg