[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3441/8267] x11-common: Merge into xserver-nodm-init

[Emmanuele Bassi <ebassi src gnome org>]

commit dc7f4a5bf8d99280ef67301008b9878dbb43d05b
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Tue Nov 15 13:41:58 2016 +0200

    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>

 meta/conf/distro/include/distro_alias.inc          |    1 -
 .../packagegroups/packagegroup-core-x11.bb         |    9 +-
 .../x11-common/x11-common/etc/X11/Xdefaults        |    3 -
 .../x11-common/etc/X11/Xsession.d/12keymap.sh      |    4 -
 .../x11-common/x11-common/etc/X11/default.xmodmap  |  260 --------------
 .../x11-common/x11-common/gplv2-license.patch      |  355 --------------------
 meta/recipes-graphics/x11-common/x11-common_0.1.bb |   22 --
 .../etc => xserver-nodm-init}/X11/Xsession         |    0
 .../X11/Xsession.d/13xdgbasedirs.sh                |    0
 .../X11/Xsession.d/89xdgautostart.sh               |    0
 .../X11/Xsession.d/90XWindowManager.sh             |    0
 .../x11-common/xserver-nodm-init_3.0.bb            |    5 +
 12 files changed, 11 insertions(+), 648 deletions(-)
---
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 10efb09..a59265a 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"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb 
b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 4291424..001db9e 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -5,13 +5,12 @@
 PR = "r40"
 
 inherit packagegroup distro_features_check
-# rdepends on x11-common
 REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGES = "${PN} ${PN}-utils"
 
-# xserver-common, x11-common
-VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
+# backwards compatibility for xserver-common
+VIRTUAL-RUNTIME_xserver_common ?= ""
 
 # elsa, xserver-nodm-init
 VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
@@ -30,4 +29,8 @@ RDEPENDS_${PN}-utils = "\
     xhost \
     xset \
     xrandr \
+    xmodmap \
+    xdpyinfo \
+    xinput-calibrator \
+    dbus-x11 \
     "
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession 
b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
similarity index 100%
rename from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
rename to meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh 
b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
similarity index 100%
rename from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh
rename to meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh 
b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
similarity index 100%
rename from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/89xdgautostart.sh
rename to meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh 
b/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
similarity index 100%
rename from meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
rename to meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
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 a6d0d5e..62da118 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"