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/x11-common/xserver-nodm-init_3.0.bb | |
| 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/x11-common/xserver-nodm-init_3.0.bb')
| -rw-r--r-- | meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index a6d0d5eeea..62da11800c 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb @@ -6,6 +6,7 @@ PR = "r31" SRC_URI = "file://xserver-nodm \ file://Xserver \ + file://X11 \ file://gplv2-license.patch \ file://xserver-nodm.service.in \ file://xserver-nodm.conf.in \ @@ -29,6 +30,9 @@ do_install() { install xserver-nodm.conf.in ${D}${sysconfdir}/default/xserver-nodm install -d ${D}${sysconfdir}/xserver-nodm install Xserver ${D}${sysconfdir}/xserver-nodm/Xserver + install -d ${D}${sysconfdir}/X11/Xsession.d + install X11/Xsession.d/* ${D}${sysconfdir}/X11/Xsession.d/ + install X11/Xsession ${D}${sysconfdir}/X11/ BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}" if [ "${ROOTLESS_X}" = "1" ] ; then @@ -59,3 +63,4 @@ INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" +RCONFLICTS_${PN} = "xserver-common (< 1.34-r9) x11-common" |