summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-08-20 13:36:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-23 17:44:42 +0100
commit7e4d20677730176f6566e3c39db6c435b90f3f0c (patch)
treeae1987ec6cfc3c60609c1b043a9d1e4391c887fd /meta
parent7afa09db2e10896c8da91f7d19a569b13e34a7b7 (diff)
downloadopenembedded-core-contrib-7e4d20677730176f6566e3c39db6c435b90f3f0c.tar.gz
openembedded-core-contrib-7e4d20677730176f6566e3c39db6c435b90f3f0c.tar.bz2
openembedded-core-contrib-7e4d20677730176f6566e3c39db6c435b90f3f0c.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/qemux86-64.conf5
-rw-r--r--meta/conf/machine/qemux86.conf5
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf2
3 files changed, 9 insertions, 3 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 489194aa6e..ac2c039ebf 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 3cc8091581..5d22e52d27 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 7ceb6fd634..72e4fbf59b 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
-