mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-11 16:59:59 +00:00
Code Issues Projects Releases Wiki Activity

xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2013-04-27 18:34:00 +00:00
committed by Martin Jansa
parent 2d54ce17a7
commit cfbdfd6b1d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+6 -3
View File
@@ -3,9 +3,8 @@ SECTION = "x11"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" 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 upower"
RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" PR = "r7"
PR = "r6"
inherit xfce update-alternatives inherit xfce update-alternatives
@@ -25,6 +24,10 @@ pkg_postinst_${PN} () {
echo 127.0.0.1 ${MACHINE} >> /etc/hosts 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 \ FILES_${PN} += "${libdir}/xfce4/*/*/*.so \
${libdir}/xfce4/session/*-*-* \ ${libdir}/xfce4/session/*-*-* \
${datadir}/xsessions \ ${datadir}/xsessions \