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_0.1.bb | |
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_0.1.bb')
-rw-r--r-- | meta/recipes-graphics/x11-common/x11-common_0.1.bb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb deleted file mode 100644 index ab9a939ce0..0000000000 --- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | SUMMARY = "Common X11 scripts and configuration files" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
4 | SECTION = "x11" | ||
5 | PR = "r47" | ||
6 | |||
7 | inherit distro_features_check | ||
8 | # rdepends on xdypinfo xmodmap xinit | ||
9 | REQUIRED_DISTRO_FEATURES = "x11" | ||
10 | |||
11 | SRC_URI = "file://etc \ | ||
12 | file://gplv2-license.patch" | ||
13 | |||
14 | S = "${WORKDIR}" | ||
15 | |||
16 | do_install() { | ||
17 | cp -R ${S}/etc ${D}${sysconfdir} | ||
18 | chmod -R 755 ${D}${sysconfdir} | ||
19 | } | ||
20 | |||
21 | RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator formfactor" | ||
22 | |||