summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-11-15 13:41:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:05 +0000
commitdc7f4a5bf8d99280ef67301008b9878dbb43d05b (patch)
tree03104230d15d4fecf625ad788e3ce60d85f69d68 /meta/conf
parentc63811fa5b28b34edf3b34cdcc68b364dacbaa1b (diff)
downloadpoky-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/conf')
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 10efb096f0..a59265a21e 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -400,7 +400,6 @@ DISTRO_PN_ALIAS_pn-weston = "Fedora=weston OpenSuSE=weston"
400DISTRO_PN_ALIAS_pn-weston-init = "OE-Core" 400DISTRO_PN_ALIAS_pn-weston-init = "OE-Core"
401DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which" 401DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which"
402DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant" 402DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant"
403DISTRO_PN_ALIAS_pn-x11-common = "OE-Core"
404DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps" 403DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps"
405DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util" 404DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util"
406DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util" 405DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util"