Skip to contentSkip to conversation

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

PATCH In review Denis Carikli 1 participant 2 messages Jun 28, 2012 – Jul 9, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 ...0005-add-XWindowManager-Xsession.d-script.patch |   17 +++++++----------
 .../xserver-common/xserver-common_1.34.bb          |    2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)
meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch +7 -10
index f5c2c78..1782665 100644
@@ -9,18 +9,15 @@ Signed-off-by: Martin Jansa <[email protected]>
  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
-
meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +1 -1
index 1147fca..a7e8191 100644
@@ -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
Signature · 1 line
1.7.5.4
#1 lore raw
Quoted 52 lines · Denis Carikli

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

---
 ...0005-add-XWindowManager-Xsession.d-script.patch |   17 +++++++----------
.../xserver-common/xserver-common_1.34.bb          |    2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin dowManager-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin dowManager-Xsession.d-script.patch index f5c2c78..1782665 100644
---
a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin dowManager-Xsession.d-script.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWin dowManager-Xsession.d-script.patch @@ -9,18 +9,15 @@ Signed-off-by: Martin Jansa <[email protected]> 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

meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch +4 -5
-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

meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch +0 -1
-
(quoted diff) +0 -0

b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index 1147fca..a7e8191 100644

meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb DESCRIPTION = "Common X11 scripts and support files" · line 8

Quoted 8 lines
meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +1 -1
@@ -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

Ping.

Denis.