SPECS (LINUX_2_6): kernel.spec - drop bootsplash, it works only with vesafb...

[pluto]

Author: pluto                        Date: Tue Sep 23 12:05:41 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- drop bootsplash, it works only with vesafb which is disabled in pld.
- update fbcondecor bcond and config tuning.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1956 -> 1.441.2.1957) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1956 SPECS/kernel.spec:1.441.2.1957
--- SPECS/kernel.spec:1.441.2.1956	Tue Sep 23 13:30:11 2008
+++ SPECS/kernel.spec	Tue Sep 23 14:05:34 2008
@@ -26,7 +26,7 @@
 %bcond_with	pax_full	# build pax and full grsecurity (ie. grsec_full && pax)
 %bcond_with	pax		# build pax support
 
-%bcond_with	fbcondecor	# fbsplash/fbcondecor instead of bootsplash
+%bcond_with	fbcondecor	# build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
 
@@ -188,16 +188,14 @@
 # tahoe9xx http://www.tahoe.pl/drivers/tahoe9xx-2.6.24.patch
 Patch2:		tahoe9xx-2.6.24.patch
 
-# ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.21.diff.gz
-Patch3:		linux-2.6-bootsplash.patch
 # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
-Patch4:		kernel-fbcondecor.patch
+Patch3:		kernel-fbcondecor.patch
+Patch4:		linux-fbcon-margins.patch
 
 # based on 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
-Patch8:		linux-fbcon-margins.patch
-Patch9:		linux-static-dev.patch
+Patch5:		kernel-squashfs.patch
+Patch6:		linux-static-dev.patch
 
 # netfilter related stuff mostly based on patch-o-matic-ng
 # snapshot 20061213 with some fixes related to changes in
@@ -738,19 +736,15 @@
 %endif
 
 %patch2 -p1
-
-%patch8 -p1
-
-%if !%{with fbcondecor}
 %patch3 -p1
-%else
+%if %{with fbcondecor}
 %patch4 -p1
 %endif
 
 # squashfs
-%patch6 -p1
+%patch5 -p1
 
-%patch9 -p1
+%patch6 -p1
 
 ## netfilter
 #
@@ -1139,9 +1133,11 @@
 %endif
 
 %if %{with fbcondecor}
+	sed -i "s:CONFIG_FB_S3=m:# CONFIG_FB_S3 is not set:" %{defconfig}
+	sed -i "s:CONFIG_FB_VT8623=m:# CONFIG_FB_VT8623 is not set:" %{defconfig}
+	sed -i "s:CONFIG_FB_ARK=m:# CONFIG_FB_ARK is not set:" %{defconfig}
+	sed -i "s:CONFIG_FB_TILEBLITTING=y:# CONFIG_FB_TILEBLITTING is not set:" %{defconfig}
 	echo "CONFIG_FB_CON_DECOR=y" >> %{defconfig}
-%else
-	echo "CONFIG_BOOTSPLASH=y" >> %{defconfig}
 %endif
 
 %if %{with nfsroot}
@@ -1683,6 +1679,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1957  2008/09/23 12:05:34  pluto
+- drop bootsplash, it works only with vesafb which is disabled in pld.
+- update fbcondecor bcond and config tuning.
+
 Revision 1.441.2.1956  2008/09/23 11:30:11  pluto
 - update taho9xx patch.
 
================================================================

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