]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
x11-common: Merge into xserver-nodm-init
authorJussi Kukkonen <jussi.kukkonen@intel.com>
Tue, 15 Nov 2016 11:41:58 +0000 (13:41 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 30 Nov 2016 15:47:09 +0000 (15:47 +0000)
commitee153327b046fe8474e498f39ecc87e573bc8604
tree2dde7ff8d25532521cc67819e4767812682b7916
parentbf6fd144b6f3539009089df5f188d09c7c899140
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).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
12 files changed:
meta/conf/distro/include/distro_alias.inc
meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xdefaults [deleted file]
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh [deleted file]
meta/recipes-graphics/x11-common/x11-common/etc/X11/default.xmodmap [deleted file]
meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch [deleted file]
meta/recipes-graphics/x11-common/x11-common_0.1.bb [deleted file]
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession [moved from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession with 100% similarity]
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh [moved from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh with 100% similarity]
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh [moved from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh with 100% similarity]
meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh [moved from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh with 100% similarity]
meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb