diff options
Diffstat (limited to 'meta-oe/recipes-graphics/lxdm/lxdm_git.bb')
-rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 12 |
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 | |||
15 | SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b" | 15 | SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b" |
16 | PV = "0.4.2+git${SRCPV}" | 16 | PV = "0.4.2+git${SRCPV}" |
17 | PE = "1" | 17 | PE = "1" |
18 | PR = "r3" | 18 | PR = "r6" |
19 | 19 | ||
20 | DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" | 20 | DEPENDS = "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 |
23 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" | 23 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" |
24 | 24 | ||
25 | inherit autotools gettext | 25 | inherit autotools gettext systemd |
26 | 26 | ||
27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
28 | 28 | ||
29 | SYSTEMD_UNITDIR ??= "no" | 29 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" |
30 | EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}" | ||
31 | 30 | ||
32 | do_compile_append() { | 31 | do_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 | ||
68 | RDEPENDS_${PN} = "pam-plugin-loginuid setxkbmap" | 67 | RDEPENDS_${PN} = "pam-plugin-loginuid setxkbmap" |
68 | |||
69 | RPROVIDES_${PN} += "${PN}-systemd" | ||
70 | RREPLACES_${PN} += "${PN}-systemd" | ||
71 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
72 | SYSTEMD_SERVICE_${PN} = "lxdm.service" | ||