From dc7f4a5bf8d99280ef67301008b9878dbb43d05b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 15 Nov 2016 13:41:58 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/x11-common/x11-common_0.1.bb | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 meta/recipes-graphics/x11-common/x11-common_0.1.bb (limited to 'meta/recipes-graphics/x11-common/x11-common_0.1.bb') 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 @@ -SUMMARY = "Common X11 scripts and configuration files" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SECTION = "x11" -PR = "r47" - -inherit distro_features_check -# rdepends on xdypinfo xmodmap xinit -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "file://etc \ - file://gplv2-license.patch" - -S = "${WORKDIR}" - -do_install() { - cp -R ${S}/etc ${D}${sysconfdir} - chmod -R 755 ${D}${sysconfdir} -} - -RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator formfactor" - -- cgit v1.2.3-54-g00ecf