summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 14:59:30 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:05 +0200
commit61241113169b676b8c8c5989017262de0e9ca9b1 (patch)
treec3ae209b5409b6e25dfa8b40c6972ce1787d4533 /meta-oe/recipes-graphics
parent2db07ef244ef4ae249e954bcda93f83052bb96a0 (diff)
downloadmeta-openembedded-61241113169b676b8c8c5989017262de0e9ca9b1.tar.gz
lxdm: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm_git.bb12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index be83146b0..a6f266cc3 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -15,19 +15,18 @@ LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam
15SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b" 15SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b"
16PV = "0.4.2+git${SRCPV}" 16PV = "0.4.2+git${SRCPV}"
17PE = "1" 17PE = "1"
18PR = "r3" 18PR = "r6"
19 19
20DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" 20DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
21 21
22# combine oe-core way with angstrom DISTRO_TYPE 22# combine oe-core way with angstrom DISTRO_TYPE
23DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" 23DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
24 24
25inherit autotools gettext 25inherit autotools gettext systemd
26 26
27S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
28 28
29SYSTEMD_UNITDIR ??= "no" 29EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
30EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
31 30
32do_compile_append() { 31do_compile_append() {
33 # default background configured not available / no password field available / no default screensaver 32 # default background configured not available / no password field available / no default screensaver
@@ -66,3 +65,8 @@ sed -i "s:last_langs=.*$:last_langs=$langs:g" ${localstatedir}/lib/lxdm/lxdm.con
66} 65}
67 66
68RDEPENDS_${PN} = "pam-plugin-loginuid setxkbmap" 67RDEPENDS_${PN} = "pam-plugin-loginuid setxkbmap"
68
69RPROVIDES_${PN} += "${PN}-systemd"
70RREPLACES_${PN} += "${PN}-systemd"
71RCONFLICTS_${PN} += "${PN}-systemd"
72SYSTEMD_SERVICE_${PN} = "lxdm.service"