SPECS (LINUX_2_6): kernel.spec - updated for Xen.

[cieciwa]

Author: cieciwa                      Date: Wed Apr 26 10:34:44 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- updated for Xen.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1512 -> 1.441.2.1513) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1512 SPECS/kernel.spec:1.441.2.1513
--- SPECS/kernel.spec:1.441.2.1512	Tue Apr 25 09:39:59 2006
+++ SPECS/kernel.spec	Wed Apr 26 12:34:39 2006
@@ -10,14 +10,15 @@
 %bcond_without	source		# don't build kernel-source package
 %bcond_without	pcmcia		# don't build pcmcia
 
+%bcond_with	grsec_full	# build full grsecurity
 %bcond_with	preemptive	# build preemptive kernel
 %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_with	xen0		# added Xen0 support
+%bcond_with	xenU		# added XenU 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
 
 %{?debug:%define with_verbose 1}
 
@@ -158,6 +159,8 @@
 Source43:	kernel-vserver.config
 Source44:	kernel-vesafb-tng.config
 Source45:	kernel-grsec.config
+Source46:	kernel-xen0.config
+Source47:	kernel-xenU.config
 
 ###
 #	Patches
@@ -272,7 +275,7 @@
 Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	kernel(nf-hipac) = %{_nf_hipac_ver}
 Provides:	kernel(realtime-lsm) = 0.1.1
-%if %{with xen}
+%if %{with xen0} || %{with xenU}
 Provides:	kernel(xen) = %{_xen_version}
 %endif
 Provides:	kernel-misc-fuse
@@ -301,7 +304,7 @@
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
-%if %{with xen}
+%if %{with xen0} || %{with xenU}
 ExclusiveArch:	%{ix86}
 %else
 ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc ppc64 sparc sparc64
@@ -438,7 +441,7 @@
 Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	kernel(nf-hipac) = %{_nf_hipac_ver}
 Provides:	kernel(realtime-lsm) = 0.1.1
-%if %{with xen}
+%if %{with xen0} || %{with xenU}
 Provides:	kernel(xen) = %{_xen_version}
 %endif
 Provides:	kernel-smp-misc-fuse
@@ -750,11 +753,9 @@
 %endif
 %endif
 
-%if %{with xen}
+%if %{with xen0} || %{with xenU}
 %ifarch %{ix86}
 %patch120 -p1
-%else
-echo "Arch: $arch is not supported by Xen"
 %endif
 %endif
 
@@ -874,6 +875,14 @@
 	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with xen0}
+	cat %{SOURCE46} >> arch/%{_target_base_arch}/defconfig
+%endif	
+
+%if %{with xenU}
+	cat %{SOURCE47} >> arch/%{_target_base_arch}/defconfig
+%endif	
+	
 	# fbsplash
 	echo "CONFIG_FB_SPLASH=y" >> arch/%{_target_base_arch}/defconfig
 
@@ -1140,7 +1149,7 @@
 		title='PLD Linux'
 	fi
 
-	ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen:Xen}%{?with_preemptive:preempt}'
+	ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}%{?with_preemptive:preempt}'
 	if [ "$ext" ]; then
 		title="$title $ext"
 	fi
@@ -1212,7 +1221,7 @@
 		title='PLD Linux'
 	fi
 
-	ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen:Xen}%{?with_preemptive:preempt}'
+	ext='%{?with_grsec_full:grsecurity}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}%{?with_preemptive:preempt}'
 	if [ "$ext" ]; then
 		title="$title $ext"
 	fi
@@ -1595,6 +1604,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1513  2006/04/26 10:34:39  cieciwa
+- updated for Xen.
+
 Revision 1.441.2.1512  2006/04/25 07:39:59  paszczus
 - updated to 2.6.16.11
 - added warning about OldWorldMacs
================================================================

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