From 6ea72c6bd0aeaed694d58d68ede4de70d96b7e4b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 Mar 2017 16:35:33 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xf86-config/10-preload-modules.conf | 10 ---------- meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | 8 -------- 2 files changed, 18 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf 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 @@ -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 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" 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 -} -- cgit 1.2.3-korg