mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core)

Browse Source 
Without that fix environments like sato cannot start because
  they require x-session-manager to be started instead of
  x-window-manager.

Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Denis Carikli
2012-06-28 13:38:20 +00:00
committed by Eric Bénard
parent a8aa197265
commit bf047d774b
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
+7 -10
View File
@@ -9,18 +9,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 files changed, 6 insertions(+), 0 deletions(-) 1 files changed, 6 insertions(+), 0 deletions(-)
create mode 100644 X11/Xsession.d/90xXWindowManager create mode 100644 X11/Xsession.d/90xXWindowManager
diff --git a/X11/Xsession.d/90xXWindowManager b/X11/Xsession.d/90xXWindowManager Index: xserver-common-1.34/X11/Xsession.d/90xXWindowManager
new file mode 100644 ===================================================================
index 0000000..3df8435 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
--- /dev/null +++ xserver-common-1.34/X11/Xsession.d/90xXWindowManager 2012-06-28 15:02:22.010521773 +0200
+++ b/X11/Xsession.d/90xXWindowManager @@ -0,0 +1,7 @@
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -x $HOME/.Xsession ]; then +if [ -x $HOME/.Xsession ]; then
+ exec $HOME/.Xsession + exec $HOME/.Xsession
+elif [ -x /usr/bin/x-session-manager ]; then
+ exec /usr/bin/x-session-manager
+else +else
+ exec /usr/bin/x-window-manager + exec /usr/bin/x-window-manager
+fi +fi
--
1.7.8.5
meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+1 -1
View File
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
PR = "r6" PR = "r7"
# we are using a gpe-style Makefile # we are using a gpe-style Makefile
inherit gpe inherit gpe