SPECS (LINUX_2_6): kernel.spec - xenU/xen0 bcond and conflicts

[speedy]

Author: speedy                       Date: Sat Jun 11 12:15:14 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- xenU/xen0 bcond and conflicts 

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1100 -> 1.441.2.1101) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1100 SPECS/kernel.spec:1.441.2.1101
--- SPECS/kernel.spec:1.441.2.1100	Sat Jun 11 13:58:25 2005
+++ SPECS/kernel.spec	Sat Jun 11 14:15:05 2005
@@ -17,15 +17,12 @@
 %bcond_with	regparm		# (ix86) use register arguments (this break binary-only modules)
 %bcond_with	em8300		# DXR3/Hollywood
 %bcond_with	xen0		# build Xen0 kernel
+%bcond_with	xenU		# build XenU kernel
 
-%if %{with xen0}
+%if %{with xen0} || %{with xenU}
 %define with_xen 1
 %endif
 
-%if %{with xen} && %{with grsecurity}
-xen conflics with grsecurity
-%endif
-
 %if !%{with grsecurity}
 %undefine	with_pax
 %endif
@@ -50,6 +47,14 @@
 grsecurity conflicts with vserver
 %endif
 
+%if %{with xen} && %{with grsecurity}
+xen conflicts with grsecurity
+%endif
+
+%if %{with xen0} && %{with xenU}
+xen0 conflicts with xenU
+%endif
+
 %{?debug:%define with_verbose 1}
 
 %ifarch sparc
@@ -61,6 +66,11 @@
 %undefine	with_up
 %endif
 
+%if %{with xenU}
+# guest is only UP
+%undefine	with_smp
+%endif
+
 ## Program required by kernel to work.
 %define		_binutils_ver		2.12
 %define		_util_linux_ver		2.10o
@@ -94,7 +104,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_grsecurity:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}
+Name:		kernel%{?with_grsecurity:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 %define		_postver	.11
 #define		_postver	%{nil}
 Version:	2.6.11%{_postver}
@@ -1349,6 +1359,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1101  2005/06/11 12:15:05  speedy
+- xenU/xen0 bcond and conflicts
+
 Revision 1.441.2.1100  2005/06/11 11:58:25  speedy
 - xen is only on %%{ix86} (exclusive arch)
 
================================================================

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