SPECS (LINUX_2_6_22): kernel.spec - kernel-vserver-lback-feat02.pa...

[zbyniu]

Author: zbyniu                       Date: Thu Feb  7 18:29:39 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- kernel-vserver-lback-feat02.patch added; rel 3

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.48 -> 1.441.2.1796.2.49) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.48 SPECS/kernel.spec:1.441.2.1796.2.49
--- SPECS/kernel.spec:1.441.2.1796.2.48	Thu Feb  7 10:14:20 2008
+++ SPECS/kernel.spec	Thu Feb  7 19:29:33 2008
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 #
-# STATUS: 2.6.22.16 ready
+# STATUS: ready
 #
 # TODO:
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
@@ -105,7 +105,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			2
+%define		_rel			3
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_enable_debug_packages			0
@@ -295,6 +295,8 @@
 # currently based on http://people.linux-vserver.org/~dhozac/p/k/patch-2.6.22.16-vs2.3.0.29.2.diff
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
+# http://vserver.13thfloor.at/Experimental/delta-lback-feat02.diff
+Patch103:	kernel-vserver-lback-feat02.patch
 # based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.2-vs2.2.0.3.diff
 Patch102:	linux-2.6-vs2.2.patch
 # note about vserver 2.2 vs 2.3: 2.2 is "stable", 2.3 is "development", currently (2007-09-03)
@@ -819,7 +821,9 @@
 %patch23 -p1
 
 # kernel-owner-xid.patch
+%if %{with vserver}
 %patch37 -p1
+%endif
 
 # kernel-ipt_account.patch
 %patch38 -p1
@@ -885,6 +889,7 @@
 %patch102 -p1
 %else
 %patch100 -p1
+%patch103 -p1
 %endif
 %if %{with suspend2}
 #ifarch %{ix86} %{x8664} ia64
@@ -1694,6 +1699,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.49  2008-02-07 18:29:33  zbyniu
+- kernel-vserver-lback-feat02.patch added; rel 3
+
 Revision 1.441.2.1796.2.48  2008-02-07 09:14:20  arekm
 - rel 2; fix grsec_full build
 
================================================================

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