SPECS (LINUX_2_6): kex.spec - removex Xen specific command.

[cieciwa]

Author: cieciwa                      Date: Thu Jun 30 08:23:08 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- removex Xen specific command.

---- Files affected:
SPECS:
   kex.spec (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SPECS/kex.spec
diff -u SPECS/kex.spec:1.1.2.2 SPECS/kex.spec:1.1.2.3
--- SPECS/kex.spec:1.1.2.2	Mon Jun 27 15:22:07 2005
+++ SPECS/kex.spec	Thu Jun 30 10:23:03 2005
@@ -52,7 +52,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}%{?with_xenU:-xenU}
+Name:		kernel
 %define		_postver	.1
 #define		_postver	%{nil}
 Version:	2.6.12%{_postver}
@@ -142,11 +142,7 @@
 Conflicts:	nfs-utils < %{_nfs_utils_ver}
 Conflicts:	procps < %{_procps_ver}
 Conflicts:	oprofile < %{_oprofile_ver}
-%if %{with xen}
-ExclusiveArch:	%{ix86}
-%else
 ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc sparc sparc64
-%endif
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -504,24 +500,15 @@
 CrossOpts=""
 %endif
 
-%if %{with xen}
-CrossOpts="ARCH=xen"
-%define _main_target_base_arch i386
-%define _target_base_arch xen
-%endif
-
 BuildConfig() {
 	%{?debug:set -x}
 	# is this a special kernel we want to build?
 	smp=
 	[ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
-	xen=
-	%{?with_xen0:xen="0"}
-	%{?with_xenU:xen="U"}
 	if [ "$smp" = "yes" ]; then
-		Config="%{_target_base_arch}$xen-smp"
+		Config="%{_target_base_arch}-smp"
 	else
-		Config="%{_target_base_arch}$xen"
+		Config="%{_target_base_arch}"
 	fi
 	KernelVer=%{version}-%{release}$1
 	echo "Building config file for KERNEL $1..."
@@ -584,10 +571,6 @@
 	%{__make} $CrossOpts include/linux/version.h \
 		%{?with_verbose:V=1}
 
-%if %{with xen}
-	%{__make} $CrossOpts oldconfig
-%endif
-
 # make does vmlinux, modules and bzImage at once
 %ifarch sparc sparc64
 %ifarch sparc64
@@ -619,12 +602,8 @@
 	mkdir -p $KERNEL_INSTALL_DIR/boot
 	install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
 %ifarch %{ix86} %{x8664}
-%if %{with xen}
-	install vmlinuz $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
-%else
 	install arch/%{_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 %endif
-%endif
 %ifarch alpha sparc sparc64
 	gzip -cfv vmlinux > vmlinuz
 	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -676,11 +655,9 @@
 # SMP KERNEL
 KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-SMP"
 rm -rf $KERNEL_INSTALL_DIR
-%if !%{with xen}
 BuildConfig smp
 %{?with_smp:BuildKernel smp}
 %{?with_smp:PreInstallKernel smp}
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1032,9 +1009,7 @@
 %defattr(644,root,root,755)
 %dir %{_prefix}/src/linux-%{version}
 %{_prefix}/src/linux-%{version}/include
-%if !%{with xen}
 %{_prefix}/src/linux-%{version}/config-smp
-%endif
 %{_prefix}/src/linux-%{version}/config-up
 
 %files module-build
@@ -1099,6 +1074,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.3  2005/06/30 08:23:03  cieciwa
+- removex Xen specific command.
+
 Revision 1.1.2.2  2005/06/27 13:22:07  cieciwa
 - BIG clean.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kex.spec?r1=1.1.2.2&r2=1.1.2.3&f=u