diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-04-27 18:34:00 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-03 13:32:03 +0200 |
commit | cfbdfd6b1da4325de3b0cf195d6f860621ee3c13 (patch) | |
tree | ade725ae73815fff48d2e6680acb32227872f6ef /meta-xfce | |
parent | 2d54ce17a7c857de05034eb96652c0e7257de0ea (diff) | |
download | meta-openembedded-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.bb | 9 |
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 8de95ee02..bbe92e8cb 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" | |||
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" |
5 | DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" | 5 | DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" |
6 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 6 | RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower" |
7 | RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" | 7 | PR = "r7" |
8 | PR = "r6" | ||
9 | 8 | ||
10 | inherit xfce update-alternatives | 9 | inherit xfce update-alternatives |
11 | 10 | ||
@@ -25,6 +24,10 @@ pkg_postinst_${PN} () { | |||
25 | echo 127.0.0.1 ${MACHINE} >> /etc/hosts | 24 | echo 127.0.0.1 ${MACHINE} >> /etc/hosts |
26 | } | 25 | } |
27 | 26 | ||
27 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" | ||
28 | PACKAGECONFIG[systemd] = "--enable-systemd, --disable-systemd, polkit, systemd" | ||
29 | PACKAGECONFIG[consolekit] = ",,,consolekit" | ||
30 | |||
28 | FILES_${PN} += "${libdir}/xfce4/*/*/*.so \ | 31 | FILES_${PN} += "${libdir}/xfce4/*/*/*.so \ |
29 | ${libdir}/xfce4/session/*-*-* \ | 32 | ${libdir}/xfce4/session/*-*-* \ |
30 | ${datadir}/xsessions \ | 33 | ${datadir}/xsessions \ |