From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp203.alice.it ([82.57.200.99]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SoEeh-00049g-3V for openembedded-devel@lists.openembedded.org; Mon, 09 Jul 2012 16:09:39 +0200 Received: from denis-n73sv.localnet (79.7.128.87) by smtp203.alice.it (8.6.023.02) (authenticated as editempo@alice.it) id 4ECA5E230819A552 for openembedded-devel@lists.openembedded.org; Mon, 9 Jul 2012 15:52:49 +0200 From: Denis Carikli To: openembedded-devel@lists.openembedded.org Date: Mon, 09 Jul 2012 15:52:48 +0200 Message-ID: <25319920.MRo7ttM4mH@denis-n73sv> Organization: Eukrea User-Agent: KMail/4.7.3 (Linux/3.0.0-20-generic-pae; KDE/4.7.4; i686; ; ) In-Reply-To: <1340890700-31781-1-git-send-email-denis@eukrea.com> References: <1340890700-31781-1-git-send-email-denis@eukrea.com> MIME-Version: 1.0 Subject: Re: [meta-oe][PATCH] xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core) X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 14:09:39 -0000 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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 > --- > ...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 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.