mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mklive: remove modesetting workaround for musl, intel(4) works again.

Browse Source
This commit is contained in:
Juan RP 2015-05-27 16:49:33 +02:00
parent ae8d2e93eb
commit 00dda59b0b
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-x86-images.sh.in
View File

@ -18,7 +18,7 @@ case "$ARCH" in
esac esac
readonly BASE_PKGS="dialog cryptsetup lvm2 mdadm $GRUB" readonly BASE_PKGS="dialog cryptsetup lvm2 mdadm $GRUB"
readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font cantarell-fonts gnome-themes-standard alsa-plugins-pulseaudio firefox" readonly X_PKGS="$BASE_PKGS xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font cantarell-fonts gnome-themes-standard alsa-plugins-pulseaudio"
readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2" readonly E_PKGS="$X_PKGS lxdm enlightenment terminology econnman udisks2"
readonly XFCE_PKGS="$X_PKGS lxdm xfce4 network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" readonly XFCE_PKGS="$X_PKGS lxdm xfce4 network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2"
readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2" readonly MATE_PKGS="$X_PKGS lxdm mate mate-extra network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2"

4
data/xorg-modesetting.conf
View File

@ -1,4 +0,0 @@
Section "Device"
Identifier "modesetting"
Driver "modesetting"
EndSection

5
mklive.sh.in
View File

@ -115,11 +115,6 @@ install_packages() {
else else
install -Dm755 /usr/sbin/void-installer $ROOTFS/usr/sbin/void-installer install -Dm755 /usr/sbin/void-installer $ROOTFS/usr/sbin/void-installer
fi 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. # Cleanup and remove useless stuff.
rm -rf $ROOTFS/var/cache/* $ROOTFS/run/* $ROOTFS/var/run/* rm -rf $ROOTFS/var/cache/* $ROOTFS/run/* $ROOTFS/var/run/*
} }