summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-11-21 13:16:45 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-11-29 11:03:35 +0100
commit3f2736b481787ec2b8c8b00f670cac8aae681cd4 (patch)
tree14689a6494baa2e4c0851032b7c6c0d449eacbed /meta-oe/recipes-graphics
parent946c52ccf1cbdaa1d6337486e9ac3a1b0f3bb8a5 (diff)
downloadmeta-openembedded-3f2736b481787ec2b8c8b00f670cac8aae681cd4.tar.gz
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>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm_git.bb10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index fd28c41c9..f3d4effa7 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -12,8 +12,10 @@ SRC_URI = " \
12 12
13LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" 13LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}"
14 14
15SRCREV = "d681bc90b62ec2e13ed62fc30cdaf5dbbba23cdc" 15SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b"
16PV = "0.4.2+git${SRCPV}" 16PV = "0.4.2+git${SRCPV}"
17PE = "1"
18PR = "r1"
17 19
18DEPENDS = "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"
19 21
@@ -24,10 +26,14 @@ inherit autotools gettext
24 26
25S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
26 28
29SYSTEMD_UNITDIR ??= "no"
30EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
31
27do_compile_append() { 32do_compile_append() {
28 # default background configured not available / no password field available 33 # default background configured not available / no password field available
29 sed -i -e 's,bg=,# bg=,g' \ 34 sed -i -e 's,bg=,# bg=,g' \
30 -e 's,# skip_password=,skip_password=,g' \ 35 -e 's,# skip_password=,skip_password=,g' \
36 -e 's,keyboard=0,keyboard=1,g' \
31 ${S}/data/lxdm.conf.in 37 ${S}/data/lxdm.conf.in
32 # add default configuration 38 # add default configuration
33 oe_runmake -C ${S}/data lxdm.conf 39 oe_runmake -C ${S}/data lxdm.conf
@@ -59,4 +65,4 @@ done
59sed -i "s:last_langs=.*$:last_langs=$langs:g" ${localstatedir}/lib/lxdm/lxdm.conf 65sed -i "s:last_langs=.*$:last_langs=$langs:g" ${localstatedir}/lib/lxdm/lxdm.conf
60} 66}
61 67
62RDEPENDS_${PN} = "pam-plugin-loginuid" 68RDEPENDS_${PN} = "pam-plugin-loginuid setxkbmap"