SPECS (LINUX_2_6): kernel.spec - vesafbs cleanups

[zbyniu]

Author: zbyniu                       Date: Thu Mar 20 11:42:00 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- vesafbs cleanups

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1855 -> 1.441.2.1856) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1855 SPECS/kernel.spec:1.441.2.1856
--- SPECS/kernel.spec:1.441.2.1855	Wed Mar 19 15:29:49 2008
+++ SPECS/kernel.spec	Thu Mar 20 12:41:54 2008
@@ -37,7 +37,6 @@
 %bcond_with	pax		# build pax support
 
 %bcond_with	fbsplash	# fbsplash instead of bootsplash
-%bcond_with	uvesafb		# uvesafb, vesafb replacement from gentoo
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
 
@@ -212,9 +211,6 @@
 # based on http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.20-rc6.patch
 Patch4:		fbsplash-0.9.2-r5-2.6.20-rc6.patch
 
-# http://dev.gentoo.org/~spock/projects/uvesafb/archive/uvesafb-0.1-rc3-2.6.23-rc3.patch
-Patch5:		kernel-uvesafb.patch
-
 # http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tgz
 # squashfs3.3/kernel-patches/linux-2.6.24/squashfs3.3-patch
 Patch6:		kernel-squashfs.patch
@@ -500,7 +496,6 @@
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
 
 %description -l de.UTF-8
@@ -516,7 +511,6 @@
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
 
 %description -l fr.UTF-8
@@ -532,7 +526,6 @@
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
 
 %description -l pl.UTF-8
@@ -547,7 +540,6 @@
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
-%{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
 
 %package vmlinux
@@ -765,10 +757,6 @@
 %patch4 -p1
 %endif
 
-%ifarch %{ix86}
-%{?with_vesafb_tng:%patch5 -p1}
-%endif
-
 # squashfs
 %patch6 -p1
 
@@ -1146,10 +1134,6 @@
 	sed -i "s:CONFIG_IPV6=.:# CONFIG_IPV6 is not set:" %{defconfig}
 %endif
 
-%if %{with uvesa}
-	echo "CONFIG_FB_UVESA=m" >> %{defconfig}
-%endif
-
 # grsecurity & pax stuff
 #
 
@@ -1685,6 +1669,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1856  2008-03-20 11:41:54  zbyniu
+- vesafbs cleanups
+
 Revision 1.441.2.1855  2008-03-19 14:29:49  zbyniu
 - new define defconfig, s at arch/%{target_arch_dir}/defconfig@%{defconfig}@g
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1855&r2=1.441.2.1856&f=u