* [meta-oe][PATCH] xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core)
@ 2012-06-28 13:38 Denis Carikli
2012-07-09 13:52 ` Denis Carikli
0 siblings, 1 reply; 2+ messages in thread
From: Denis Carikli @ 2012-06-28 13:38 UTC (permalink / raw)
To: openembedded-devel
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>
---
...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-XWindowManager-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
index f5c2c78..1782665 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 1147fca..a7e8191 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
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-oe][PATCH] xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core)
2012-06-28 13:38 [meta-oe][PATCH] xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core) Denis Carikli
@ 2012-07-09 13:52 ` Denis Carikli
0 siblings, 0 replies; 2+ messages in thread
From: Denis Carikli @ 2012-07-09 13:52 UTC (permalink / raw)
To: openembedded-devel
On Thursday, June 28, 2012 03:38:20 PM Denis Carikli wrote:
> 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>
> ---
> ...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 <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
> 1147fca..a7e8191 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
Ping.
Denis.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-09 14:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-28 13:38 [meta-oe][PATCH] xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core) Denis Carikli
2012-07-09 13:52 ` Denis Carikli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.