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:47:09 +0000 |
| commit | ee153327b046fe8474e498f39ecc87e573bc8604 (patch) | |
| tree | 2dde7ff8d25532521cc67819e4767812682b7916 /meta/recipes-graphics/packagegroups | |
| parent | bf6fd144b6f3539009089df5f188d09c7c899140 (diff) | |
| download | openembedded-core-contrib-ee153327b046fe8474e498f39ecc87e573bc8604.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).
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics/packagegroups')
| -rw-r--r-- | meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 42914246dc..001db9e5e2 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -5,13 +5,12 @@ PR = "r40" inherit packagegroup distro_features_check -# rdepends on x11-common REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "${PN} ${PN}-utils" -# xserver-common, x11-common -VIRTUAL-RUNTIME_xserver_common ?= "x11-common" +# backwards compatibility for xserver-common +VIRTUAL-RUNTIME_xserver_common ?= "" # elsa, xserver-nodm-init VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" @@ -30,4 +29,8 @@ RDEPENDS_${PN}-utils = "\ xhost \ xset \ xrandr \ + xmodmap \ + xdpyinfo \ + xinput-calibrator \ + dbus-x11 \ " |