aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2012-06-28 13:38:20 +0000
committerEric BĂ©nard <eric@eukrea.com>2012-07-30 10:23:34 +0200
commitbf047d774bac8a9389bebb5e8860bc618ce48277 (patch)
tree08b2f4a896beac62bb5a95bb9e0ff2fd3ed989d6
parenta8aa197265cbc2af632ab4e50bd21171f9840942 (diff)
downloadmeta-openembedded-bf047d774bac8a9389bebb5e8860bc618ce48277.tar.gz
meta-openembedded-bf047d774bac8a9389bebb5e8860bc618ce48277.tar.bz2
meta-openembedded-bf047d774bac8a9389bebb5e8860bc618ce48277.zip
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>
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch17
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb2
2 files changed, 8 insertions, 11 deletions
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
index f5c2c786d..1782665b2 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
@@ -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
-
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 1147fca30..a7e81917f 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
@@ -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