Patchwork [meta-oe,1/2] xserver-nodm-init: use /etc/X11/Xserver from service file instead of Xorg directly

login
mail settings
Submitter Martin Jansa
Date April 10, 2012, 5:59 a.m.
Message ID <447016b1ed3811830299ad0145a8e3216abd50c4.1334037469.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/25487/
State Accepted
Commit 8f6027c1bd6659bc393bb652727456f3daa80832
Headers show

Comments

Martin Jansa - April 10, 2012, 5:59 a.m.
From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>

* /etc/X11/Xserver is provided by xserver-common and sets correct DPI
  before starting Xorg (or other xserver)

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xserver-nodm-init-2.0/xserver-nodm.service     |    2 +-
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - April 11, 2012, 1:07 p.m.
On Wed, Apr 11, 2012 at 02:10:29PM -0300, Otavio Salvador wrote:
> On Tue, Apr 10, 2012 at 02:59, Martin Jansa <martin.jansa@gmail.com> wrote:
> > * /etc/X11/Xserver is provided by xserver-common and sets correct DPI
> >  before starting Xorg (or other xserver)
> 
> This breaks the images using systemd only as it depends on init.d/functions now.

Ah sorry I still had initscripts around in systemd image, please test
following patch. I'm sending all those changes also to florian to apply
them upstream so maybe we'll drop them from meta-oe and use 1.35 instead
later.

Cheers,

> 
> -- 
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Otavio Salvador - April 11, 2012, 5:10 p.m.
On Tue, Apr 10, 2012 at 02:59, Martin Jansa <martin.jansa@gmail.com> wrote:
> * /etc/X11/Xserver is provided by xserver-common and sets correct DPI
>  before starting Xorg (or other xserver)

This breaks the images using systemd only as it depends on init.d/functions now.

Patch

diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
index b781c7d..a35d70e 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
@@ -2,7 +2,7 @@ 
 Description=Xserver startup with a display manager
 
 [Service]
-ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /usr/bin/Xorg
+ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /etc/X11/Xserver
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 98025d3..36d9bfc 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -3,7 +3,7 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "file://xserver-nodm \
            file://xserver-nodm.service \