summaryrefslogtreecommitdiff
path: root/recipes-lxde/lxdm
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-12-13 12:25:24 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2020-01-09 19:49:53 +0100
commit888c731f3867e4f7bdcf851e6d81428295ac57eb (patch)
treec5ecd4946bb3ee3ac7828d1369d3128b58c9009d /recipes-lxde/lxdm
parentd3f35dac21d275357fd9afd00042b131684b5200 (diff)
images: drop lxde-image, lxqt-image, qt5-x11-image
As no image uses firefox, stop touching the recipe. Thus this layer no longer depends on meta-browser. As no image uses lxde, stop touching the recipes. Thus this layer no longer depends on meta-lxde. Related-to: ELB-1284 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-lxde/lxdm')
-rw-r--r--recipes-lxde/lxdm/lxdm/0001-do-not-crash-if-there-is-no-last_session.patch27
-rw-r--r--recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch39
-rw-r--r--recipes-lxde/lxdm/lxdm/logout-fixes.patch15
-rw-r--r--recipes-lxde/lxdm/lxdm/root-autologin.patch12
-rw-r--r--recipes-lxde/lxdm/lxdm_%.bbappend8
5 files changed, 0 insertions, 101 deletions
diff --git a/recipes-lxde/lxdm/lxdm/0001-do-not-crash-if-there-is-no-last_session.patch b/recipes-lxde/lxdm/lxdm/0001-do-not-crash-if-there-is-no-last_session.patch
deleted file mode 100644
index 9099d4b..0000000
--- a/recipes-lxde/lxdm/lxdm/0001-do-not-crash-if-there-is-no-last_session.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 28e38e6fc6efcee28ea1c85589ebcece3e9a5efe Mon Sep 17 00:00:00 2001
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 22 Dec 2017 09:58:41 +0100
-Subject: [LXDM][PATCH] do not crash if there is no last_session
-
-Upstream-Status: Pending
-
----
- src/lxdm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lxdm.c b/src/lxdm.c
-index a37f051..b36debf 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -1276,7 +1276,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
- LXSession *s,*prev;
-
- lxdm_save_login(session,lang);
-- if(!strcmp(session,"__default__"))
-+ if(session && !strcmp(session,"__default__"))
- session=NULL;
-
- if(!session ||!session[0] || !lang || !lang[0])
---
-2.15.1
-
diff --git a/recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch b/recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch
deleted file mode 100644
index a0c7f21..0000000
--- a/recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 597507f6a6a05140d01db9fa16351ac158674960 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Tue, 10 Jan 2017 18:15:18 +0100
-Subject: [PATCH] lxdm.service: kill lxsession explicitely with sigkill
-
-When shuting down on a Colibri iMX6 we often see that the shutdown gets
-delayed with:
-
-[ OK ] Removed slice system-serial\x2dgetty.slice.
-[ **] A stop job is running for Session c1 of user root (8s / 1min 30s)
-
-When one examines this one or several process of lxdm/lxde are still running.
-After the timeout runs out the process(es) get killed with SIGKILL, often
-triggering
-
-[ 77.886935] [drm:drm_legacy_unlock] *ERROR* Process 536 using kernel context 0
-
-Killing lxsession seems to cure the issue.
-
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- systemd/lxdm.service | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/systemd/lxdm.service b/systemd/lxdm.service
-index bf4a0a8..a116f9d 100644
---- a/systemd/lxdm.service
-+++ b/systemd/lxdm.service
-@@ -5,6 +5,7 @@ After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
-
- [Service]
- ExecStart=/usr/sbin/lxdm
-+ExecStop=/usr/bin/killall -9 lxsession
- Restart=always
- IgnoreSIGPIPE=no
-
---
-2.5.5
-
diff --git a/recipes-lxde/lxdm/lxdm/logout-fixes.patch b/recipes-lxde/lxdm/lxdm/logout-fixes.patch
deleted file mode 100644
index 649c12f..0000000
--- a/recipes-lxde/lxdm/lxdm/logout-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 0219dd3..0000000
--- a/recipes-lxde/lxdm/lxdm/root-autologin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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_%.bbappend b/recipes-lxde/lxdm/lxdm_%.bbappend
deleted file mode 100644
index c5f52fd..0000000
--- a/recipes-lxde/lxdm/lxdm_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/lxdm:"
-
-SRC_URI += " \
- file://logout-fixes.patch \
- file://root-autologin.patch \
- file://0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch \
- file://0001-do-not-crash-if-there-is-no-last_session.patch \
-"