SPECS (LINUX_2_6): kernel.spec - Xen 3.0.2 added.

[cieciwa]

Author: cieciwa                      Date: Wed Apr 19 12:05:57 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- Xen 3.0.2 added.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1492 -> 1.441.2.1493) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1492 SPECS/kernel.spec:1.441.2.1493
--- SPECS/kernel.spec:1.441.2.1492	Wed Apr 19 09:51:59 2006
+++ SPECS/kernel.spec	Wed Apr 19 14:05:51 2006
@@ -14,6 +14,7 @@
 %bcond_with	suspend2	# build software suspend support
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	vserver		# added vserver.
+%bcond_with	xen		# added Xen support.
 %bcond_without	grsecurity	# don't build grsecurity at all
 %bcond_without	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
 %bcond_with	grsec_full	# build full grsecurity
@@ -108,7 +109,7 @@
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):	Jądro Linuksa
-Name:		kernel%{?with_grsec_full:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_preemptive:-preempt}
+Name:		kernel%{?with_grsec_full:-grsecurity}%{?with_vserver:-vserver}%{?with_xen:-xen}%{?with_preemptive:-preempt}
 %define		_postver	.9
 #define		_postver	%{nil}
 Version:	2.6.16%{_postver}
@@ -235,6 +236,10 @@
 Patch100:	linux-2.6-vs2.1.patch
 Patch101:	linux-2.6-vs2.1-grsec-minimal.patch
 
+# 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
+
+
 Patch1000:	linux-2.6-grsec-minimal.patch
 # grsecurity snap for 2.6.16.
 # from http://www.grsecurity.net/~spender/grsecurity-2.1.9-2.6.16-200603292139.patch
@@ -289,11 +294,7 @@
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
 %if %{with xen}
-%if %{with xendev}
-ExclusiveArch:	%{ix86} %{x8664}
-%else
 ExclusiveArch:	%{ix86}
-%endif
 %else
 ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc ppc64 sparc sparc64
 %endif
@@ -740,6 +741,14 @@
 %endif
 %endif
 
+%if %{with xen}
+%ifarch %{ix86}
+%patch120 -p1
+%endif
+%else
+echo "Arch: $arch is not supported by Xen"
+%endif
+
 %if %{with grsec_minimal} && %{without vserver}
 %patch1000 -p1
 %endif
@@ -1125,7 +1134,7 @@
 		title='PLD Linux'
 	fi
 
-	ext='%{?with_grsec_full:grsecurity}%{?with_omosix:openMosix}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}%{?with_preemptive:preempt}'
+	ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen:Xen}%{?with_preemptive:preempt}'
 	if [ "$ext" ]; then
 		title="$title $ext"
 	fi
@@ -1197,7 +1206,7 @@
 		title='PLD Linux'
 	fi
 
-	ext='%{?with_grsec_full:grsecurity}%{?with_omosix:openMosix}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}%{?with_preemptive:preempt}'
+	ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen:Xen}%{?with_preemptive:preempt}'
 	if [ "$ext" ]; then
 		title="$title $ext"
 	fi
@@ -1581,6 +1590,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1493  2006/04/19 12:05:51  cieciwa
+- Xen 3.0.2 added.
+
 Revision 1.441.2.1492  2006/04/19 07:51:59  cieciwa
 - updated to 2.6.16.9 - [PATCH] i386/x86-64: Fix x87 information leak between processes (CVE-2006-1056),
 - updated MD5 sum.
================================================================

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