SPECS: kernel-desktop.spec - added bootsplash support (with bcond)

[charles]

Author: charles                      Date: Thu Jun 22 22:25:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bootsplash support (with bcond)

---- Files affected:
SPECS:
   kernel-desktop.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.26 SPECS/kernel-desktop.spec:1.27
--- SPECS/kernel-desktop.spec:1.26	Wed Jun 21 19:52:59 2006
+++ SPECS/kernel-desktop.spec	Fri Jun 23 00:25:44 2006
@@ -9,6 +9,7 @@
 %bcond_without	preemptrt	# don't build preemptive kernel
 %bcond_without	suspend2	# don't build software suspend support
 %bcond_without	grsec_minimal	# don't build grsecurity (minimal subset: proc,link,fifo,shm)
+%bcond_with	bootsplash	# build with bootsplash instead of fbsplash
 %bcond_with	laptop		# build with HZ=100
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	test_build	# don't patch with preemptrt nor any patch depending no it
@@ -171,6 +172,8 @@
 
 Patch57:	kernel-desktop-cpuset_virtualization.patch
 
+Patch58:	kernel-desktop-bootsplash.patch
+
 Patch60:	kernel-desktop-sk98lin.patch
 
 Patch300:	kernel-desktop-preempt_ppc_fix.patch
@@ -646,7 +649,11 @@
 
 %patch4 -p1
 
+%if !%{with bootsplash}
 %{!?with_test_build:%patch5 -p1}
+%else
+%patch58 -p1
+%endif
 
 %patch6 -p1
 
@@ -805,6 +812,12 @@
 		-i arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with bootsplash}
+	sed -e 's:CONFIG_FB_SPLASH:CONFIG_BOOTSPLASH:'		\
+		-e 's:CONFIG_LOGO=y:# CONFIG_LOGO is not set:'	\
+		-i 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}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{_target_base_arch}/defconfig}
@@ -1382,6 +1395,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2006/06/22 22:25:44  charles
+- added bootsplash support (with bcond)
+
 Revision 1.26  2006/06/21 17:52:59  sparky
 - builds with grsec_minimal: rel 0.3 (ppc still broken)
 - added with laptop bcond
================================================================

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