]> code.ossystems Code Review - openembedded-core.git/commit
xserver-nodm-init: Deprecate /etc/X11/Xserver
authorJussi Kukkonen <jussi.kukkonen@intel.com>
Thu, 1 Sep 2016 06:53:04 +0000 (09:53 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 8 Sep 2016 07:25:18 +0000 (08:25 +0100)
commite8ce3d2626e505924a75de96650abca166fd230a
treec87ca7f378b1654c0ebca2fc82d35b552f7f0c1b
parent8296e258b36a6238605e068e13c1982b1d12fe53
xserver-nodm-init: Deprecate /etc/X11/Xserver

This commit should provide the same functionality as before, but
should make meta-oe xserver-nodm-init-2.0 obsolete as well as
keep systemd and sysvinit startup better in sync.

/etc/X11/Xserver is not called anymore: it is provided by both
x11-common and xserver-common with no useful differences (but some
annoying ones). Instead xserver-nodm-init provides
/etc/xserver-nodm/Xserver as the startup script and
/etc/default/xserver-nodm as the default settings file. These are
used by both init systems.

The Xserver script could be completely removed (with sysv and
systemd calling xinit directly), but to keep compatibility with
meta-oes xserver-nodm-init-2.0 the Xserver script sources
/etc/X11/xserver-common if one exists -- and systemd EnvironmentFile
cannot do that.

x11-common used to have a packageconfig to easily control screen
blanking. Move this to xserver-nodm-init.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-graphics/x11-common/xserver-nodm-init.bb
meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver [new file with mode: 0644]
meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername [deleted file]
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf [deleted file]
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in [new file with mode: 0644]
meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in [moved from meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service with 76% similarity]