[oe-commits] Khem Raj : xserver-xf86-config: Preload graphics driver modules for musl

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 92be71296e1b7ed1e6387ae381942072aa3bb4f3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=92be71296e1b7ed1e6387ae381942072aa3bb4f3

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Apr 10 18:20:45 2015 -0700

xserver-xf86-config: Preload graphics driver modules for musl

musl does not support BIND_LAZY intentionally, which means
dlopen will always complain about missing symbols which is what
X does when loading graphics drivers, here we preload the needed
drivers for all emulator machines if libc is musl

Change-Id: I908c94c30db8a5e872922e1a677126d82fa17145
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../xorg-xserver/xserver-xf86-config/10-preload-modules.conf     | 9 +++++++++
 meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb    | 9 +++++++++
 2 files changed, 18 insertions(+)

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
new file mode 100644
index 0000000..7ceb6fd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
@@ -0,0 +1,9 @@
+Section "Module"
+    Load "fbdevhw"
+    Load "fb"
+    Load "shadow"
+    Load "shadowfb"
+    Load "vbe"
+    Load "vgahw"
+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 5420b7d..e07c204 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,9 +7,14 @@ 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"
+CONFFILES_${PN}_append_libc-musl = " ${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY_${PN} = "1"
@@ -20,3 +25,7 @@ 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
+}