SPECS (LINUX_2_6_20): kernel.spec - rel 0.8 - added wrr support (c...

[mguevara]

Author: mguevara                     Date: Mon Feb 26 09:59:02 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- rel 0.8
- added wrr support (currently in bcond): wrr-linux-051111-2.6.20.patch
  and kernel-wrr.config
- some kernel-netfilter.config cleaning (imq related)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.49 -> 1.441.2.1698.2.50) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.49 SPECS/kernel.spec:1.441.2.1698.2.50
--- SPECS/kernel.spec:1.441.2.1698.2.49	Mon Feb 26 00:34:01 2007
+++ SPECS/kernel.spec	Mon Feb 26 10:58:56 2007
@@ -68,6 +68,7 @@
 
 %bcond_without	ide_acpi	# support for ide-acpi from SuSE
 %bcond_without	imq		# imq support
+%bcond_with	wrr		# wrr support
 
 %bcond_without	vserver		# support for VServer (enabled by default) 
 %bcond_without	suspend2	# support for Suspend2 (enabled by default)
@@ -147,7 +148,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.7
+%define		_rel			0.8
 
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
@@ -231,6 +232,7 @@
 Source50:	kernel-no-pax.config
 Source55:	kernel-imq.config
 Source56:	kernel-reiser4.config
+Source57:	kernel-wrr.config
 
 ###
 #	Patches
@@ -323,12 +325,15 @@
 
 Patch50:	linux-2.6.19-imq1.diff
 
-# based on ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.19/reiser4-for-2.6.19-2.patch.gz
+# reiser4 based on ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.19/reiser4-for-2.6.19-2.patch.gz
 Patch51:	reiser4-for-2.6.19-2.patch
 
-# esfq
-# from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
+# wrr http://www.zz9.dk/patches/wrr-linux-051111-2.6.20.patch.gz
+Patch52:	wrr-linux-051111-2.6.20.patch
+
+# esfq from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
 Patch53:	esfq-kernel.patch
+
 # from http://memebeam.org/free-software/toshiba_acpi/
 Patch54:	linux-2.6-toshiba_acpi_0.18-dev_toshiba_test4.patch
 # by Baggins request:
@@ -1018,9 +1023,16 @@
 %patch51 -p1
 %endif
 
+# esfq
 %patch53 -p1
+
+%if %{with wrr} 
+%patch52 -p1
+%endif
+
 # TODO check linux-2.6-toshiba_acpi_0.18-dev_toshiba_test4.patch
 #patch54 -p1
+
 %patch55 -p1
 %patch56 -p1
 
@@ -1231,6 +1243,10 @@
 	cat %{SOURCE55} >> arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with wrr}
+	cat %{SOURCE57} >> arch/%{_target_base_arch}/defconfig
+%endif
+
 %if %{with reiser4}
 	cat %{SOURCE56} >> arch/%{_target_base_arch}/defconfig
 %endif
@@ -1978,6 +1994,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1698.2.50  2007/02/26 09:58:56  mguevara
+- rel 0.8
+- added wrr support (currently in bcond): wrr-linux-051111-2.6.20.patch
+  and kernel-wrr.config
+- some kernel-netfilter.config cleaning (imq related)
+
 Revision 1.441.2.1698.2.49  2007/02/25 23:34:01  mguevara
 - rel 0.7
 - updated configs for sparc, sparc64 and alpha archs:
================================================================

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