aboutsummaryrefslogtreecommitdiff
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 15:37:04 +0000
commit6ea72c6bd0aeaed694d58d68ede4de70d96b7e4b (patch)
tree56fcdd16f64a802f96b213ac7a8c96f63c215c5c
parent759eed2b02e0a7b5c8b19d4b087d9151c009eed4 (diff)
downloadopenembedded-core-contrib-6ea72c6bd0aeaed694d58d68ede4de70d96b7e4b.zip
openembedded-core-contrib-6ea72c6bd0aeaed694d58d68ede4de70d96b7e4b.tar.gz
openembedded-core-contrib-6ea72c6bd0aeaed694d58d68ede4de70d96b7e4b.tar.bz2
xserver-xf86-config: Remove X server module preload
This was a solution needed for musl but now musl has got lazy loading. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 23fcdc7..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Section "Module"
- Load "fbdevhw"
- Load "fb"
- Load "shadow"
- Load "shadowfb"
- Load "int10"
- Load "vbe"
- Load "vgahw"
- Load "glamoregl"
-EndSection
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 e07c204..4c442bc 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"
SRC_URI = "file://xorg.conf"
-SRC_URI_append_libc-musl = "\
- file://10-preload-modules.conf \
-"
-
S = "${WORKDIR}"
CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf"
@@ -25,7 +21,3 @@ do_install () {
install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
fi
}
-
-do_install_append_libc-musl () {
- install -Dm 0644 ${WORKDIR}/10-preload-modules.conf ${D}/${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf
-}