mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core)
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:
parent
a8aa197265
commit
bf047d774b
|
|
@ -9,18 +9,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|||
1 files changed, 6 insertions(+), 0 deletions(-)
|
||||
create mode 100644 X11/Xsession.d/90xXWindowManager
|
||||
|
||||
diff --git a/X11/Xsession.d/90xXWindowManager b/X11/Xsession.d/90xXWindowManager
|
||||
new file mode 100644
|
||||
index 0000000..3df8435
|
||||
--- /dev/null
|
||||
+++ b/X11/Xsession.d/90xXWindowManager
|
||||
@@ -0,0 +1,6 @@
|
||||
+#!/bin/sh
|
||||
Index: xserver-common-1.34/X11/Xsession.d/90xXWindowManager
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ xserver-common-1.34/X11/Xsession.d/90xXWindowManager 2012-06-28 15:02:22.010521773 +0200
|
||||
@@ -0,0 +1,7 @@
|
||||
+if [ -x $HOME/.Xsession ]; then
|
||||
+ exec $HOME/.Xsession
|
||||
+elif [ -x /usr/bin/x-session-manager ]; then
|
||||
+ exec /usr/bin/x-session-manager
|
||||
+else
|
||||
+ exec /usr/bin/x-window-manager
|
||||
+fi
|
||||
--
|
||||
1.7.8.5
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
|
|||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
PR = "r6"
|
||||
PR = "r7"
|
||||
|
||||
# we are using a gpe-style Makefile
|
||||
inherit gpe
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user