summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-10 18:20:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-13 22:33:23 +0100
commit4fb58a4585f6582c0c4016acfd47fc1e28e54b0b (patch)
treebd27f4e3bd2c33da31f95269fcc59634dbf9c6a7
parent40db5c4baa5c13da7450173705922497aa4068c1 (diff)
downloadpoky-4fb58a4585f6582c0c4016acfd47fc1e28e54b0b.tar.gz
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 (From OE-Core rev: 92be71296e1b7ed1e6387ae381942072aa3bb4f3) 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.conf9
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb9
2 files changed, 18 insertions, 0 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
new file mode 100644
index 0000000000..7ceb6fd634
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
@@ -0,0 +1,9 @@
1Section "Module"
2 Load "fbdevhw"
3 Load "fb"
4 Load "shadow"
5 Load "shadowfb"
6 Load "vbe"
7 Load "vgahw"
8EndSection
9
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 5420b7d23e..e07c204c74 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"
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
10S = "${WORKDIR}" 14S = "${WORKDIR}"
11 15
12CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" 16CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf"
17CONFFILES_${PN}_append_libc-musl = " ${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf"
13 18
14PACKAGE_ARCH = "${MACHINE_ARCH}" 19PACKAGE_ARCH = "${MACHINE_ARCH}"
15ALLOW_EMPTY_${PN} = "1" 20ALLOW_EMPTY_${PN} = "1"
@@ -20,3 +25,7 @@ do_install () {
20 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ 25 install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
21 fi 26 fi
22} 27}
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}