SPECS (LINUX_2_6_16): kernel.spec - bconded bootsplash added (work...

[havner]

Author: havner                       Date: Fri Jul  7 11:56:37 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- bconded bootsplash added (works, tested)
- what to enable by default? fbsplash/bootsplash
- what about archs !x86?
- rel 0.1 (there were no 1 for .24 so no point in leaving 1.1)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.13 -> 1.441.2.1558.2.14) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.13 SPECS/kernel.spec:1.441.2.1558.2.14
--- SPECS/kernel.spec:1.441.2.1558.2.13	Fri Jul  7 01:44:08 2006
+++ SPECS/kernel.spec	Fri Jul  7 13:56:31 2006
@@ -19,6 +19,7 @@
 %bcond_without	grsecurity	# don't build grsecurity at all
 %bcond_without	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
 
+%bcond_with	bootsplash	# build with bootsplash instead of fbsplash
 %bcond_with	vesafb_tng	# vesafb-tng, vesafb replacement from gentoo
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
@@ -101,7 +102,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			1.1
+%define		_rel			0.1
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -183,6 +184,8 @@
 # tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
 Patch2:		tahoe9xx-2.6.11.5.patch
 
+#	ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.15.diff
+Patch3:		bootsplash-3.1.6-2.6.15.diff
 #	http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.16.patch
 Patch4:		fbsplash-0.9.2-r5-2.6.16.patch
 Patch5:		linux-2.6-vesafb-tng.patch
@@ -720,7 +723,12 @@
 
 %patch2 -p1
 
+%patch8 -p1
+%if %{with bootsplash}
+%patch3 -p1
+%else
 %patch4 -p1
+%endif
 
 %ifarch %{ix86}
 %{?with_vesafb_tng:%patch5 -p1}
@@ -729,7 +737,6 @@
 %patch6 -p1
 
 %patch7 -p1
-%patch8 -p1
 %patch9 -p1
 
 ## netfilter
@@ -941,6 +948,8 @@
 	
 	# fbsplash
 	echo "CONFIG_FB_SPLASH=y" >> arch/%{_target_base_arch}/defconfig
+	# bootsplash
+	echo "CONFIG_BOOTSPLASH=y" >> arch/%{_target_base_arch}/defconfig
 
 %if %{with nfsroot}
 	sed -i "s:CONFIG_NFS_FS=m:CONFIG_NFS_FS=y:" arch/%{_target_base_arch}/defconfig
@@ -1653,6 +1662,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.14  2006/07/07 11:56:31  havner
+- bconded bootsplash added (works, tested)
+- what to enable by default? fbsplash/bootsplash
+- what about archs !x86?
+- rel 0.1 (there were no 1 for .24 so no point in leaving 1.1)
+
 Revision 1.441.2.1558.2.13  2006/07/06 23:44:08  adamg
 - updated to 2.6.16.24, security fix:
   fix prctl privilege escalation and suid_dumpable (CVE-2006-2451)
================================================================

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