From 40dce269a8c85fc3ab73049e904b92c79bac83d6 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 30 Aug 2016 11:32:08 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf | 1 - 1 file changed, 1 deletion(-) delete mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf (limited to 'meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf') diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf deleted file mode 100644 index 3c0582a87e..0000000000 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf +++ /dev/null @@ -1 +0,0 @@ -HOME=/home/root -- cgit 1.2.3-korg