SPECS (LINUX_2_6_22): kernel.spec - try adding xen patch

[glen]

Author: glen                         Date: Thu May 22 22:41:16 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- try adding xen patch

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.76 -> 1.441.2.1796.2.77) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.76 SPECS/kernel.spec:1.441.2.1796.2.77
--- SPECS/kernel.spec:1.441.2.1796.2.76	Sun May 18 20:59:58 2008
+++ SPECS/kernel.spec	Fri May 23 00:41:10 2008
@@ -111,7 +111,7 @@
 %define		squashfs_version	3.2
 %define		suspend_version		2.2.10
 %define		netfilter_snap		20070806
-%define		xen_version		3.0.2
+%define		xen_version		3.2
 
 %define		__alt_kernel	%{?with_pax:pax}%{?with_grsec_full:grsecurity}%{?with_xen0:xen0}%{?with_xenU:xenU}
 %if "%{__alt_kernel}" != ""
@@ -319,8 +319,8 @@
 # it was proposed to use 2.2 as a temp replacement. One could use vs 2.2 instead of 2.3
 # by using vs22 bcond - this bcond also changes IPV6 option from "y" to "m".
 
-# from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
-#Patch120: xen-3.0-2.6.16.patch
+# http://xenbits.xensource.com/linux-2.6.18-xen.hg
+Patch120:		kernel-xen-xen.patch
 
 # Wake-On-Lan fix for nForce drivers; using http://atlas.et.tudelft.nl/verwei90/nforce2/wol.html
 # Fix verified for that kernel version.
@@ -431,7 +431,8 @@
 Provides:	%{name}(netfilter) = %{netfilter_snap}
 Provides:	%{name}(vermagic) = %{kernel_release}
 %if %{with xen0} || %{with xenU}
-Provides:	kernel(xen) = %{_xen_version}
+Requires:	xen >= %{xen_version}
+Provides:	kernel(xen) = %{xen_version}
 %endif
 Obsoletes:	kernel%{_alt_kernel}-scsi-mv
 Obsoletes:	kernel%{_alt_kernel}-smp-scsi-mv
@@ -458,7 +459,7 @@
 Conflicts:	util-linux < 2.10o
 Conflicts:	xfsprogs < 2.6.0
 %if %{with xen0} || %{with xenU}
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} %{x8664} ia64
 %else
 ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc ppc64 sparc sparc64 arm
 %endif
@@ -892,19 +893,17 @@
 %patch102 -p1
 %else
 %patch100 -p1
-%endif
-%if %{with suspend2}
-#ifarch %{ix86} %{x8664} ia64
-%patch101 -p1
+#%endif
+#%if %{with suspend2}
+ifarch %{ix86} %{x8664} ia64
+#%patch101 -p1
 #endif
 %endif
 %endif
 
-#%if %{with xen0} || %{with xenU}
-#%ifarch %{ix86} %{x8664} ia64
-#%patch120 -p1
-#%endif
-#%endif
+%if %{with xen0} || %{with xenU}
+%patch120 -p1
+%endif
 
 # forcedeth:
 %patch130 -p1
@@ -1729,6 +1728,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.77  2008-05-22 22:41:10  glen
+- try adding xen patch
+
 Revision 1.441.2.1796.2.76  2008-05-18 18:59:58  glen
 - update unionfs to 2.3.3
 - trim Features in %description; rel 8
================================================================

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