lxdm: bugfixes by updating to latest git

* make keyboard layout combobox display languages properly
* systemd-support is included mainline
* autologin for timeouts < 5s works as expected

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 1 insertions, 19 deletions

diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
deleted file mode 100644
index 0bc6774f32..0000000000
--- a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=LXDE Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=%sbindir%/lxdm
-StandardOutput=syslog
-
-[Install]
-Alias=display-manager.service
diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
index e4cf44d3ff..2828a7034f 100644
--- a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
+++ b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
@@ -3,14 +3,6 @@ PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
-SRC_URI += "file://lxdm.service.in"
-
-do_install_append() {
-        install -d ${D}${systemd_unitdir}/system
-        sed -e 's,%sbindir%,${sbindir},g' \
-                < ${WORKDIR}/lxdm.service.in \
-                > ${D}${systemd_unitdir}/system/lxdm.service
-}
-
+SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 SYSTEMD_PACKAGES = "${PN}-systemd"
 SYSTEMD_SERVICE = "lxdm.service"