diff options
| -rw-r--r-- | build-x86-images.sh.in | 2 | ||||
| -rw-r--r-- | data/xorg-modesetting.conf | 4 | ||||
| -rw-r--r-- | mklive.sh.in | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/build-x86-images.sh.in b/build-x86-images.sh.in index 9168feb..8ec55c9 100644 --- a/build-x86-images.sh.in +++ b/build-x86-images.sh.in @@ -18,7 +18,7 @@ case "$ARCH" in esac 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 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" diff --git a/data/xorg-modesetting.conf b/data/xorg-modesetting.conf deleted file mode 100644 index 1d10c80..0000000 --- a/data/xorg-modesetting.conf +++ /dev/null @@ -1,4 +0,0 @@ -Section "Device" - Identifier "modesetting" - Driver "modesetting" -EndSection diff --git a/mklive.sh.in b/mklive.sh.in index ca39200..9523c0c 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -115,11 +115,6 @@ 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/* } |