SPECS (LINUX_2_6): kernel.spec - added bootsplash support (with bc...

[charles]

Author: charles                      Date: Fri Dec 16 19:45:26 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- added bootsplash support (with bcond)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1349 -> 1.441.2.1350) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1349 SPECS/kernel.spec:1.441.2.1350
--- SPECS/kernel.spec:1.441.2.1349	Thu Dec 15 12:38:16 2005
+++ SPECS/kernel.spec	Fri Dec 16 20:45:20 2005
@@ -25,6 +25,7 @@
 %bcond_with	xenU		# build XenU kernel
 %bcond_with	xendev		# build Xen-devel kernel
 %bcond_with	abi		# build with unix abi support
+%bcond_with	bootsplash	# build with bootsplash instead of fbsplash
 
 %if %{with xen0} || %{with xenU}
 %define with_xen 1
@@ -85,6 +86,7 @@
 %if %{with xen}
 # xen (for now) is only UP
 %undefine	with_smp
+%undefine	with_bootsplash
 %endif
 
 %ifarch %{x8664}
@@ -300,8 +302,9 @@
 # derived from http://www.syskonnect.de/syskonnect/support/driver/zip/linux/install-8_23.tar.bz2
 Patch82:	linux-2.6-sk98lin-8.23.1.3.patch
 Patch83:	fbsplash-0.9.2-r5-2.6.14.patch
+Patch84:	bootsplash-3.1.6-2.6.13.diff
 # reserve dynamic minors for device mapper
-Patch84:	linux-static-dev.patch
+Patch85:	linux-static-dev.patch
 # http://ifp-driver.sourceforge.net/
 Patch86:	iriverfs-r0.1.0.1.patch
 Patch87:	squashfs2.2-patch
@@ -825,8 +828,13 @@
 %patch80 -p1
 
 %patch82 -p1
+%if !%{with bootsplash}
 %patch83 -p1
+%else
 %patch84 -p1
+%endif
+
+%patch85 -p1
 
 %patch86 -p1
 %patch87 -p1
@@ -1044,6 +1052,10 @@
 %if %{with preemptive}
 	cat %{SOURCE96} >> arch/%{_target_base_arch}/defconfig
 %endif
+%if %{with bootsplash}
+	sed -i 's,CONFIG_FB_SPLASH,CONFIG_BOOTSPLASH,' arch/%{_target_base_arch}/defconfig
+	sed -i 's,CONFIG_LOGO=y,# CONFIG_LOGO is not set,' arch/%{_target_base_arch}/defconfig
+%endif
 
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" arch/%{_target_base_arch}/defconfig}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{_target_base_arch}/defconfig}
@@ -1748,6 +1760,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1350  2005/12/16 19:45:20  charles
+- added bootsplash support (with bcond)
+
 Revision 1.441.2.1349  2005/12/15 11:38:16  cieciwa
 - _rel 0.99,
 - added "-v" to geninitrd.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1349&r2=1.441.2.1350&f=u