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/conf/distro/include/distro_alias.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'meta/conf') 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" DISTRO_PN_ALIAS_pn-weston-init = "OE-Core" DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which" DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant" -DISTRO_PN_ALIAS_pn-x11-common = "OE-Core" DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps" DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util" DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util" -- cgit v1.2.3-54-g00ecf