aboutsummaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-04-27 18:34:00 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-03 13:32:03 +0200
commitcfbdfd6b1da4325de3b0cf195d6f860621ee3c13 (patch)
treeade725ae73815fff48d2e6680acb32227872f6ef /meta-xfce
parent2d54ce17a7c857de05034eb96652c0e7257de0ea (diff)
downloadmeta-openembedded-contrib-cfbdfd6b1da4325de3b0cf195d6f860621ee3c13.tar.gz
xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 8de95ee02b..bbe92e8cb5 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -3,9 +3,8 @@ SECTION = "x11"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
-PR = "r6"
+RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower"
+PR = "r7"
inherit xfce update-alternatives
@@ -25,6 +24,10 @@ pkg_postinst_${PN} () {
echo 127.0.0.1 ${MACHINE} >> /etc/hosts
}
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+PACKAGECONFIG[systemd] = "--enable-systemd, --disable-systemd, polkit, systemd"
+PACKAGECONFIG[consolekit] = ",,,consolekit"
+
FILES_${PN} += "${libdir}/xfce4/*/*/*.so \
${libdir}/xfce4/session/*-*-* \
${datadir}/xsessions \