diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-29 17:08:51 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-01 15:28:53 +0100 |
| commit | 8efa63e1a846a015bec57d8f4ba6054c5ec96d39 (patch) | |
| tree | 76b730485c85381636532c9b181d891f2cfd06f9 | |
| parent | 513e7ca20ddd0a5c3b649bf292a67c3e0473d3a8 (diff) | |
| download | meta-openembedded-contrib-8efa63e1a846a015bec57d8f4ba6054c5ec96d39.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>
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 0000000000..5a759640ca --- /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 @@ +From 8171f89944969a081be1ac193b2a59016e39a345 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 29 Oct 2013 17:07:21 +0100 +Subject: [PATCH 14/14] Xserver: Start Xsession like x11-common does + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + X11/Xserver | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/X11/Xserver b/X11/Xserver +index 559f059..4b88637 100755 +--- a/X11/Xserver ++++ b/X11/Xserver +@@ -4,6 +4,6 @@ + . /etc/X11/xserver-common + + echo "tslib: $TSLIB_TSDEVICE" +-echo "exec $XSERVER $ARGS -dpi $DPI $*" +-exec $XSERVER $ARGS -dpi $DPI $* ++echo "exec xinit /etc/X11/Xsession -- $BINDIR/$XSERVER $ARGS -dpi $DPI $*" + ++exec xinit /etc/X11/Xsession -- $BINDIR/$XSERVER $ARGS -dpi $DPI $* +-- +1.8.4.2 + 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 3bb8b61a8d..481e438994 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 = " \ file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \ file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \ file://0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch \ + file://0014-Xserver-Start-Xsession-like-x11-common-does.patch \ " do_install_append() { |