浏览代码

Removed FB_UVESA (framebuffer) support and sys-apps/v86d

Also disabled "fbinit" boot service.
Removed "video=800x600-32" setting in syslinux.cfg.

VMware framebuffer should be now automatically initialized
due to DRM_VMWGFX_FBCON; QEMU's Cirrus emulation is supported
via DRM_CIRRUS_QEMU, so there is no point in continuing with
FB_UVESA just for the sake of framebuffer on old cards, especially
since video=800x600-32 interferes with DRM_CIRRUS_QEMU.
Maxim Kammerer 12 年之前
父节点
当前提交
6d79bff262

+ 0 - 39
src/etc/init.d/fbinit

@@ -1,39 +0,0 @@
-#!/sbin/runscript
-
-description="Initializes VESA framebuffer."
-
-
-depend() {
-    after modules
-
-    # framebuffer initialization resets extended ASCII mapping
-    before consolefont
-    before xconfig
-}
-
-
-start() {
-    # Load VMware / VESA framebuffer if framebuffer is not active
-    # and if video=... was specified on kernel command line
-    if [ ! -e /dev/fb0 ]; then
-        for param in `cat /proc/cmdline`; do
-            # Support only video= parameters without driver:/output: qualification
-            # /usr/src/linux/Documentation/fb/modedb.txt
-            if [ "${param}" != "${param#video=}" -a "${param}" = "${param#*:}" ]; then
-                # Use virt-what to detect VMware
-                # (VMware card is not enough, e.g., QEMU: "Hardware has no pitchlock")
-                vm=`virt-what 2>/dev/null`
-                if [ "${vm}" = vmware ]; then
-                    einfo "Initializing VMware framebuffer"
-                    modprobe -b vmwgfx enable_fbdev=1
-                    eend $?
-                else
-                    vesa_mode="${param#video=}"
-                    einfo "Initializing VESA framebuffer: ${vesa_mode}"
-                    modprobe -b uvesafb mode_option="${vesa_mode}" mtrr=3 scroll=ywrap
-                    eend $?
-                fi
-            fi
-        done
-    fi
-}

+ 1 - 1
src/etc/portage/make.conf

@@ -36,7 +36,7 @@ USE="aac acpi alsa archive aspell bluetooth bs2b cairo
      pkcs11 png policykit postscript scsi silc smartcard smime sndfile speex
      spell sse startup-notification staticsocket svg symlink thesaurus
      threads tiff truetype uuid usb v4l vorbis wavpack webgl wifi wimax wmf
-     X X509 x86emu xattr xft xinerama xmp xv"
+     X X509 xattr xft xinerama xmp xv"
 
 USE="${USE} -ant -berkdb -cracklib -cramfs -cups -cxx -enca -fts3 -gdbm -git
      -http-cache -hunspell -ipv6 -lvm1 -mudflap -orc -ptpax -qt4 -sendmail

+ 0 - 1
src/etc/portage/sets/basic

@@ -85,7 +85,6 @@ sys-apps/pciutils
 sys-fs/lsscsi
 sys-apps/usbutils
 sys-apps/pcmciautils
-sys-apps/v86d
 sys-libs/gpm
 net-wireless/bluez
 sys-fs/obexfs

+ 3 - 0
src/etc/portage/sets/temporary

@@ -5,6 +5,9 @@
 sys-kernel/hardened-sources
 dev-util/patchutils
 
+# Initramfs executables compilation
+dev-libs/klibc
+
 # Syslinux bootloader
 sys-boot/syslinux
 

+ 3 - 3
src/root/config/linux-3.9.9-hardened.config

@@ -2950,7 +2950,7 @@ CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_HDMI=y
 CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
@@ -2967,7 +2967,7 @@ CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 
 #
@@ -2980,7 +2980,7 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
-CONFIG_FB_UVESA=m
+# CONFIG_FB_UVESA is not set
 # CONFIG_FB_VESA is not set
 CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set

+ 1 - 1
src/root/config/syslinux.cfg

@@ -55,7 +55,7 @@ MENU CLEAR
 LABEL liberte
     MENU LABEL Liberté Linux VERSION
     LINUX  /liberte/boot/kernel-x86.zi
-    APPEND cdroot_hash=FSHASH video=800x600-32 blacklist=firewire-sbp2 quiet memtest=1 loglevel=4
+    APPEND cdroot_hash=FSHASH blacklist=firewire-sbp2 quiet memtest=1 loglevel=4
     TEXT HELP
 Select for normal boot.
 Optional params: readonly, [no]toram, gentoo={nosettings,noanon}.

+ 1 - 1
src/root/dist/qemulate.sh

@@ -8,7 +8,7 @@ bootdir=`dirname $0`/boot
 
 cdrom="if=virtio,format=raw,media=cdrom,aio=native,cache=none"
 
-params="loop=/ cdroot_hash=FSHASH video=800x600-32 quiet loglevel=4"
+params="loop=/ cdroot_hash=FSHASH quiet loglevel=4"
 
 export QEMU_AUDIO_DRV=alsa
 

+ 2 - 3
src/root/setup

@@ -98,8 +98,7 @@ if [ "$1" = fresh  -o  ! -e /usr/src/linux-${kversion}/incremental ]; then
     # Kernel sources should be present when sys-fs/udev is compiled,
     # also this part is often error-prone, so better do early.
     # Maintainer note: after non-fresh kernel update+compile, do
-    # emerge -q1 dev-libs/klibc sys-apps/v86d
-    #            app-emulation/{open-vm-tools-kmod,virtualbox-guest-additions}
+    # emerge -q1 app-emulation/{open-vm-tools-kmod,virtualbox-guest-additions}
     sinfo "Downloading kernel ${kversion}"
     rm -rf /usr/src/linux-${kversion} /lib/modules
     emerge -q1 =sys-kernel/hardened-sources-${hsversion}
@@ -368,7 +367,7 @@ sed -i 's/^# include /include /' /etc/nanorc
 sinfo "Configuring start-up services"
 svcsysinit="udev"
 svcboot="consolefont irqbalance haveged metalog
-         iptables consolekit lockdown fbinit"
+         iptables consolekit lockdown"
 svcdefault="liberte identity cabled persist xconfig vmconfig spindown
             acpid smartd laptop_mode gpm
             autofs NetworkManager privoxy"