From af2fcf925a0ddd0f43cc6ede164369117cacd928 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 24 May 2015 08:35:56 +0200 Subject: mklive: force modesetting on musl for now. intel and radeon drivers are currently broken with musl (segmentation fault in OsLookupColor()). --- data/xorg-modesetting.conf | 4 ++++ mklive.sh.in | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 data/xorg-modesetting.conf diff --git a/data/xorg-modesetting.conf b/data/xorg-modesetting.conf new file mode 100644 index 0000000..1d10c80 --- /dev/null +++ b/data/xorg-modesetting.conf @@ -0,0 +1,4 @@ +Section "Device" + Identifier "modesetting" + Driver "modesetting" +EndSection diff --git a/mklive.sh.in b/mklive.sh.in index 9523c0c..ca39200 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -115,6 +115,11 @@ install_packages() { else install -Dm755 /usr/sbin/void-installer $ROOTFS/usr/sbin/void-installer fi + case "$BASE_ARCH" in + *-musl) # XXX force modesetting with musl for now. + install -Dm644 data/xorg-modesetting.conf $ROOTFS/usr/share/X11/xorg.conf.d/99-modesetting.conf + ;; + esac # Cleanup and remove useless stuff. rm -rf $ROOTFS/var/cache/* $ROOTFS/run/* $ROOTFS/var/run/* } -- cgit 1.4.1