From dc7f4a5bf8d99280ef67301008b9878dbb43d05b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 15 Nov 2016 13:41:58 +0200 Subject: x11-common: Merge into xserver-nodm-init Move the (non-factual) x utils dependencies from x11-common to x11 packagegroup. Remove some obsolete configuration from x11-common: * Xsession.d/12keymap.sh: commented out xmodmap call for kdrive * default.xmodmap: xmodmap file used by 12keymap.sh * Xdefaults: rxvt configuration At this point x11-common is just /etc/X11/Xsession and three non-intrusive Xsession scripts: make these explicitly part of xserver-nodm-init. RCONFLICT with the versions of xserver-common that also provide these files. VIRTUAL-RUNTIME_xserver_common is no longer a real abstraction but preserve the setting for backwards compatibility (if the variable is set to "xserver-common", the right thing still happens). (From OE-Core rev: ee153327b046fe8474e498f39ecc87e573bc8604) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh (limited to 'meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh') diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh new file mode 100644 index 0000000000..6bd40b2fc5 --- /dev/null +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh @@ -0,0 +1,13 @@ +# Minimal/stub implementation of the XDG Base Directory specification. +# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html +# +# Wayland needs XDG_RUNTIME_DIR, so set it to /tmp. This isn't compliant with +# the specification (wrong mode, wrong owner) but it's mostly sufficient. +# +# In the ideal case where SystemD is booting and userspace is initiated by a +# SystemD user session this will have been set already, so don't overwrite it. + +if [ -z "$XDG_RUNTIME_DIR" ]; then + XDG_RUNTIME_DIR="/tmp" + export XDG_RUNTIME_DIR +fi -- cgit v1.2.3-54-g00ecf