From aaa1349fa0935ce40b6b6be5fb62273a08287518 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Wed, 29 Oct 2014 18:04:07 +0100
Subject: lxdm: switch to 0.5/git version

Switch to newer LXDM which supports logind as login/session
management.
---
 recipes-lxde/lxdm/lxdm/configfiles.patch    | 55 -----------------------------
 recipes-lxde/lxdm/lxdm/logout-fixes.patch   | 15 ++++++++
 recipes-lxde/lxdm/lxdm/root-autologin.patch | 12 +++++++
 recipes-lxde/lxdm/lxdm_0.4.1.bbappend       | 24 -------------
 recipes-lxde/lxdm/lxdm_git.bbappend         |  7 ++++
 5 files changed, 34 insertions(+), 79 deletions(-)
 delete mode 100644 recipes-lxde/lxdm/lxdm/configfiles.patch
 create mode 100644 recipes-lxde/lxdm/lxdm/logout-fixes.patch
 create mode 100644 recipes-lxde/lxdm/lxdm/root-autologin.patch
 delete mode 100644 recipes-lxde/lxdm/lxdm_0.4.1.bbappend
 create mode 100644 recipes-lxde/lxdm/lxdm_git.bbappend

(limited to 'recipes-lxde')

diff --git a/recipes-lxde/lxdm/lxdm/configfiles.patch b/recipes-lxde/lxdm/lxdm/configfiles.patch
deleted file mode 100644
index 3ffa2f5..0000000
--- a/recipes-lxde/lxdm/lxdm/configfiles.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur lxdm-0.4.1/data.orig//lxdm.conf lxdm-0.4.1/data/lxdm.conf
---- lxdm-0.4.1/data.orig//lxdm.conf	2011-07-29 15:44:51.000000000 +0200
-+++ lxdm-0.4.1/data/lxdm.conf	2012-07-25 17:50:13.101251148 +0200
-@@ -1,6 +1,6 @@
- [base]
- ## uncomment and set autologin username to enable autologin
--# autologin=dgod
-+autologin=root
- 
- ## uncomment and set timeout to enable timeout autologin,
- ## the value should >=5
-@@ -16,7 +16,7 @@
- # xauth_path=/tmp
- 
- ## greeter used to welcome the user
--greeter=/usr/local/libexec/lxdm-greeter-gtk
-+greeter=/usr/lib/lxdm/lxdm-greeter-gtk
- 
- [server]
- ## arg used to start xserver, not fully function
-diff -Naur --exclude temp lxdm-0.4.1-r3.orig/lxdm-0.4.1/data/lxdm.conf.in lxdm-0.4.1-r3/lxdm-0.4.1/data/lxdm.conf.in
---- lxdm-0.4.1/data/lxdm.conf.in	2012-07-25 10:47:22.681189278 +0200
-+++ lxdm-0.4.1/data/lxdm.conf.in	2012-07-25 17:49:49.861217834 +0200
-@@ -1,6 +1,6 @@
- [base]
- ## uncomment and set autologin username to enable autologin
--# autologin=dgod
-+autologin=root
- 
- ## uncomment and set timeout to enable timeout autologin,
- ## the value should >=5
-@@ -16,7 +16,7 @@
- # xauth_path=/tmp
- 
- ## greeter used to welcome the user
--greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
-+greeter=/usr/libexec/lxdm-greeter-gtk
- 
- [server]
- ## arg used to start xserver, not fully function
-diff -ur lxdm-0.4.1/data.orig//PostLogout.in lxdm-0.4.1/data/PostLogout.in
---- lxdm-0.4.1/data.orig//PostLogout.in	2011-07-29 15:42:33.000000000 +0200
-+++ lxdm-0.4.1/data/PostLogout.in	2011-12-31 12:21:41.000000000 +0100
-@@ -1,3 +1,9 @@
- #!/bin/sh
--#
--# Note: this is a sample and will not be run as is.
-+
-+#https://wiki.archlinux.org/index.php/LXDE#LXDM
-+
-+# Kills all your processes when you log out.
-+killall --user $USER -TERM
-+
-+# Set's the desktop background to solid black. Useful if you have multiple monitors.
-+xsetroot -solid black
diff --git a/recipes-lxde/lxdm/lxdm/logout-fixes.patch b/recipes-lxde/lxdm/lxdm/logout-fixes.patch
new file mode 100644
index 0000000..649c12f
--- /dev/null
+++ b/recipes-lxde/lxdm/lxdm/logout-fixes.patch
@@ -0,0 +1,15 @@
+diff -ur lxdm-0.4.1/data.orig//PostLogout.in lxdm-0.4.1/data/PostLogout.in
+--- lxdm-0.4.1/data.orig//PostLogout.in	2011-07-29 15:42:33.000000000 +0200
++++ lxdm-0.4.1/data/PostLogout.in	2011-12-31 12:21:41.000000000 +0100
+@@ -1,3 +1,9 @@
+ #!/bin/sh
+-#
+-# Note: this is a sample and will not be run as is.
++
++#https://wiki.archlinux.org/index.php/LXDE#LXDM
++
++# Kills all your processes when you log out.
++killall --user $USER -TERM
++
++# Set's the desktop background to solid black. Useful if you have multiple monitors.
++xsetroot -solid black
diff --git a/recipes-lxde/lxdm/lxdm/root-autologin.patch b/recipes-lxde/lxdm/lxdm/root-autologin.patch
new file mode 100644
index 0000000..0219dd3
--- /dev/null
+++ b/recipes-lxde/lxdm/lxdm/root-autologin.patch
@@ -0,0 +1,12 @@
+diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in
+index d93f280..54e310b 100644
+--- a/data/lxdm.conf.in
++++ b/data/lxdm.conf.in
+@@ -1,6 +1,6 @@
+ [base]
+ ## uncomment and set autologin username to enable autologin
+-# autologin=dgod
++autologin=root
+ 
+ ## uncomment and set timeout to enable timeout autologin,
+ ## the value should >=5
diff --git a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
deleted file mode 100644
index db15586..0000000
--- a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-    file://configfiles.patch \
-    file://lxdm.service \
-"
-
-pkg_postinst_${PN}() {
-  # Register up as default dm
-  mkdir -p ${sysconfdir}/X11/
-  echo "${sbindir}/lxdm" > ${sysconfdir}/X11/default-display-manager
-  # the lxdm script in init.d includes the script functions, make an empty one if this does not yet exist
-  touch /etc/init.d/functions
-}
- 
-pkg_postrm_${PN} () {
-  sed -i /lxdm/d ${sysconfdir}/X11/default-display-manager || true
-}
-
-do_install_append () {
-    install -d ${D}/${sysconfdir}/systemd/system
-    install -m 0644 ${WORKDIR}/lxdm.service ${D}/${sysconfdir}/systemd/system
-    ln -s lxdm.service ${D}/${sysconfdir}/systemd/system/display-manager.service
-}
diff --git a/recipes-lxde/lxdm/lxdm_git.bbappend b/recipes-lxde/lxdm/lxdm_git.bbappend
new file mode 100644
index 0000000..ed7e7ee
--- /dev/null
+++ b/recipes-lxde/lxdm/lxdm_git.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+    file://logout-fixes.patch \
+    file://root-autologin.patch \
+    ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
+"
-- 
cgit v1.2.3