SPECS (LINUX_2_6): kernel.spec - more work on xen (mostly inspired...

[speedy]

Author: speedy                       Date: Sat Jun 11 15:21:59 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- more work on xen (mostly inspired by wpk)

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

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1101 SPECS/kernel.spec:1.441.2.1102
--- SPECS/kernel.spec:1.441.2.1101	Sat Jun 11 14:15:05 2005
+++ SPECS/kernel.spec	Sat Jun 11 17:19:01 2005
@@ -699,7 +699,7 @@
 %endif
 %if %{with xen}
 %patch203 -p1
-%endif 
+%endif
 
 %patch400 -p1
 %patch401 -p1
@@ -761,15 +761,24 @@
 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}-smp"
+		Config="%{_target_base_arch}$xen-smp"
 	else
-		Config="%{_target_base_arch}"
+		Config="%{_target_base_arch}$xen"
 	fi
 	KernelVer=%{version}-%{release}$1
 	echo "Building config file for KERNEL $1..."
@@ -798,6 +807,9 @@
 	ln -sf arch/%{_target_base_arch}/defconfig .config
 	install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux
 	rm -f include/linux/autoconf.h
+%if %{with xen}
+	%{__make} $CrossOpts oldconfig
+%endif
 	%{__make} $CrossOpts include/linux/autoconf.h
 	if [ "$smp" = "yes" ]; then
 		install include/linux/autoconf.h \
@@ -829,6 +841,10 @@
 	%{__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
@@ -860,8 +876,12 @@
 	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
@@ -1359,6 +1379,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1102  2005/06/11 15:19:01  speedy
+- more work on xen (mostly inspired by wpk)
+
 Revision 1.441.2.1101  2005/06/11 12:15:05  speedy
 - xenU/xen0 bcond and conflicts
 
================================================================

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