diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2017-11-13 16:04:19 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-01-24 14:21:38 -0800 |
commit | 7b52b9641f7520314cad26489eaa870e8a69f945 (patch) | |
tree | a1e6ca7a187ed782f391b64dd608e8381665152d | |
parent | 7ec5de13ed990d4e3cbbd1ee239c82f1dd48bfdd (diff) | |
download | meta-openembedded-contrib-7b52b9641f7520314cad26489eaa870e8a69f945.tar.gz |
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 <jackie.huang@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
(cherry picked from commit 19f0e8b40b88162483198934ac38c04d60102791)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/polkit/polkit_0.113.bb | 4 |
1 files changed, 3 insertions, 1 deletions
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" |