summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-03-14 16:35:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-17 16:53:05 +0000
commit422e94cd063fbc4ba6cb15740bc71c2935956b8d (patch)
treefeaa9809978b8954b9c89deeea299fa2e12832cb /meta/recipes-graphics/xorg-xserver
parent56b2f19ca16bc09bfbec5addef360821b631b471 (diff)
downloadpoky-422e94cd063fbc4ba6cb15740bc71c2935956b8d.tar.gz
xserver-xf86-config: Remove X server module preload
This was a solution needed for musl but now musl has got lazy loading. (From OE-Core rev: 6ea72c6bd0aeaed694d58d68ede4de70d96b7e4b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf10
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb8
2 files changed, 0 insertions, 18 deletions
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
deleted file mode 100644
index 23fcdc7ef2..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
+++ /dev/null
@@ -1,10 +0,0 @@
1Section "Module"
2 Load "fbdevhw"
3 Load "fb"
4 Load "shadow"
5 Load "shadowfb"
6 Load "int10"
7 Load "vbe"
8 Load "vgahw"
9 Load "glamoregl"
10EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index e07c204c74..4c442bc712 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -7,10 +7,6 @@ PR = "r33"
7 7
8SRC_URI = "file://xorg.conf" 8SRC_URI = "file://xorg.conf"
9 9
10SRC_URI_append_libc-musl = "\
11 file://10-preload-modules.conf \
12"
13
14S = "${WORKDIR}" 10S = "${WORKDIR}"
15 11
16CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" 12CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf"
@@ -25,7 +21,3 @@ do_install () {
25 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ 21 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
26 fi 22 fi
27} 23}
28
29do_install_append_libc-musl () {
30 install -Dm 0644 ${WORKDIR}/10-preload-modules.conf ${D}/${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf
31}