summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-10-29 17:08:51 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2013-11-03 22:41:05 +0100
commit619af4afb943fed12ef150f7ecf540776fee435e (patch)
treeade6612b0daf82f1ca5427e3dab3c9e32815424c
parent4d62e7f575e2a87197c74ab4639561b45eec0e60 (diff)
downloadmeta-openembedded-619af4afb943fed12ef150f7ecf540776fee435e.tar.gz
xserver-common: start Xsession when starting Xserver
* since this commit commit 305038f932fbcb39f3bb6698f8fad18172c30962 Author: Jonathan Liu <net147@gmail.com> Date: Wed Jun 12 08:30:15 2013 +0000 xserver-nodm-init: do not execute Xsession twice xserver-nodm-init wasn't working correctly when it was used together with xserver-common which doesn't start Xsession from Xserver (unlike x11-common in oe-core). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0014-Xserver-Start-Xsession-like-x11-common-does.patch26
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb1
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0014-Xserver-Start-Xsession-like-x11-common-does.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0014-Xserver-Start-Xsession-like-x11-common-does.patch
new file mode 100644
index 000000000..5a759640c
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0014-Xserver-Start-Xsession-like-x11-common-does.patch
@@ -0,0 +1,26 @@
1From 8171f89944969a081be1ac193b2a59016e39a345 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 29 Oct 2013 17:07:21 +0100
4Subject: [PATCH 14/14] Xserver: Start Xsession like x11-common does
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 X11/Xserver | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/X11/Xserver b/X11/Xserver
12index 559f059..4b88637 100755
13--- a/X11/Xserver
14+++ b/X11/Xserver
15@@ -4,6 +4,6 @@
16 . /etc/X11/xserver-common
17
18 echo "tslib: $TSLIB_TSDEVICE"
19-echo "exec $XSERVER $ARGS -dpi $DPI $*"
20-exec $XSERVER $ARGS -dpi $DPI $*
21+echo "exec xinit /etc/X11/Xsession -- $BINDIR/$XSERVER $ARGS -dpi $DPI $*"
22
23+exec xinit /etc/X11/Xsession -- $BINDIR/$XSERVER $ARGS -dpi $DPI $*
24--
251.8.4.2
26
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
index 3bb8b61a8..481e43899 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
@@ -23,6 +23,7 @@ SRC_URI_append = " \
23 file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \ 23 file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \
24 file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \ 24 file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \
25 file://0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch \ 25 file://0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch \
26 file://0014-Xserver-Start-Xsession-like-x11-common-does.patch \
26" 27"
27 28
28do_install_append() { 29do_install_append() {