diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-11-15 13:41:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:05 +0000 |
commit | dc7f4a5bf8d99280ef67301008b9878dbb43d05b (patch) | |
tree | 03104230d15d4fecf625ad788e3ce60d85f69d68 /meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession | |
parent | c63811fa5b28b34edf3b34cdcc68b364dacbaa1b (diff) | |
download | poky-dc7f4a5bf8d99280ef67301008b9878dbb43d05b.tar.gz |
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 <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession')
-rw-r--r-- | meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession deleted file mode 100644 index 0b73127ae1..0000000000 --- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | if [ -x /usr/bin/dbus-launch ]; then | ||
4 | # As this is the X session script, always start a new DBus session. | ||
5 | eval `dbus-launch --sh-syntax --exit-with-session </dev/null` | ||
6 | echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS" | ||
7 | fi | ||
8 | |||
9 | . /etc/profile | ||
10 | |||
11 | if [ -f $HOME/.profile ]; then | ||
12 | . $HOME/.profile | ||
13 | fi | ||
14 | |||
15 | SYSSESSIONDIR=/etc/X11/Xsession.d | ||
16 | |||
17 | export CLUTTER_DISABLE_MIPMAPPED_TEXT=1 | ||
18 | |||
19 | for SESSIONFILE in $SYSSESSIONDIR/*; do | ||
20 | set +e | ||
21 | case "$SESSIONFILE" in | ||
22 | *.sh) | ||
23 | . "$SESSIONFILE" | ||
24 | ;; | ||
25 | *.shbg) | ||
26 | "$SESSIONFILE" & | ||
27 | ;; | ||
28 | *~) | ||
29 | # Ignore backup files | ||
30 | ;; | ||
31 | *) | ||
32 | "$SESSIONFILE" | ||
33 | ;; | ||
34 | esac | ||
35 | set -e | ||
36 | done | ||
37 | |||
38 | exit 0 | ||