[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2043/8267] xserver-xf86-config: pre-load int10 and exa modules

[Emmanuele Bassi <ebassi src gnome org>]

commit 7e4d20677730176f6566e3c39db6c435b90f3f0c
Author: Khem Raj <raj khem gmail com>
Date:   Sat Aug 20 13:36:09 2016 -0700

    xserver-xf86-config: pre-load int10 and exa modules
    
    musl doesn't like lazy loading that xorg uses, therefore
    load the needed modules explicitly
    
    [YOCTO #10169]
    
    (From OE-Core rev: e279c9a30f0df400b06a47a487967a734854714b)
    
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/machine/qemux86-64.conf                  |    5 ++++-
 meta/conf/machine/qemux86.conf                     |    5 ++++-
 .../xserver-xf86-config/10-preload-modules.conf    |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 489194a..ac2c039 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -22,7 +22,10 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-cirrus \
            xf86-video-fbdev \
-           xf86-video-vmware"
+           xf86-video-vmware \
+           xf86-video-modesetting \
+           xserver-xorg-module-libint10 \
+           "
 
 MACHINE_FEATURES += "x86"
 
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 3cc8091..5d22e52 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -21,7 +21,10 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-cirrus \
            xf86-video-fbdev \
-           xf86-video-vmware"
+           xf86-video-vmware \
+           xf86-video-modesetting \
+           xserver-xorg-module-libint10 \
+           "
 
 MACHINE_FEATURES += "x86"
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf 
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
index 7ceb6fd..72e4fbf 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
@@ -3,7 +3,7 @@ Section "Module"
     Load "fb"
     Load "shadow"
     Load "shadowfb"
+    Load "int10"
     Load "vbe"
     Load "vgahw"
 EndSection
-