]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.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>
Fri, 9 Sep 2016 10:53:36 +0000 (11:53 +0100)
commit3b7cdffebd12da9646f43573d989c9a76476241f
treeccb241a7b2c7974b8c42dcb31dc9b8a3009f978a
parent37f4b39d0e9809f06ac8f010a347b323857a5a0f
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.

(From OE-Core rev: e8ce3d2626e505924a75de96650abca166fd230a)

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]