소스 검색

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

Juan RP 10 년 전
부모
커밋
00dda59b0b
3개의 변경된 파일1개의 추가작업 그리고 10개의 파일을 삭제
  1. 1 1
      build-x86-images.sh.in
  2. 0 4
      data/xorg-modesetting.conf
  3. 0 5
      mklive.sh.in

+ 1 - 1
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"

+ 0 - 4
data/xorg-modesetting.conf

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

+ 0 - 5
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/*
 }