rpms/kernel/devel kernel-2.6.spec,1.2433,1.2434

[fedora-cvs-commits at redhat.com]

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10524

Modified Files:
	kernel-2.6.spec 
Log Message:
ia64 xen support, disabled by default


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2433
retrieving revision 1.2434
diff -u -r1.2433 -r1.2434
--- kernel-2.6.spec	22 Jul 2006 14:52:52 -0000	1.2433
+++ kernel-2.6.spec	22 Jul 2006 15:04:14 -0000	1.2434
@@ -36,6 +36,9 @@
 %define xen_version 20060719
 %define make_target bzImage
 %define kernel_image x86
+%define xen_flags verbose=y debug=y crash_debug=y
+%define xen_target vmlinuz
+%define xen_image vmlinuz
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
@@ -56,12 +59,18 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
-# Xen and kdump only build on i686 and x86_64 ...
+# kdump only builds on i686 and x86_64 ...
 %ifnarch i686 x86_64
-%define buildxen 0
 %define buildkdump 0
 %endif
 
+# Xen only builds on i686, x86_64 and ia64 ...
+#%ifnarch i686 x86_64 ia64
+%ifnarch i686 x86_64
+%define buildxen 0
+%endif
+
+
 %ifarch ppc64
 %define buildkdump 1
 %endif
@@ -80,6 +89,8 @@
 
 %ifarch i686
 %define buildpae 1
+# we build always xen HV with pae
+%define xen_flags verbose=y debug=y crash_debug=y pae=y
 %endif
 
 %ifarch x86_64
@@ -134,11 +145,15 @@
 %endif
 
 %ifarch ia64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config
 %define image_install_path boot/efi/EFI/redhat
 #define signmodules 1
 %define make_target compressed
 %define kernel_image vmlinux.gz
+# ia64 xen HV doesn't building with debug=y at the moment
+%define xen_flags verbose=y crash_debug=y
+%define xen_target compressed
+%define xen_image vmlinux.gz
 %endif
 
 #
@@ -1236,9 +1251,9 @@
 %if %{includexen}
 %if %{buildxen}
   cd xen
-  mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
-  make debug=y verbose=y crash_debug=y pae=y
-  install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
+  mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
+  make %{?_smp_mflags} %{xen_flags}
+  install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
   mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
@@ -1262,7 +1277,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-BuildKernel vmlinuz vmlinuz xen
+BuildKernel %xen_target %xen_image xen
 %endif
 %endif
 
@@ -1433,7 +1448,7 @@
 %post xen
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
 if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then
-	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen
 else
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi
@@ -1566,7 +1581,7 @@
 /boot/symvers-%{KVERREL}xen.gz
 /boot/symsets-%{KVERREL}xen.tar.gz
 /boot/config-%{KVERREL}xen
-/boot/xen.gz-%{KVERREL}
+/%{image_install_path}/xen.gz-%{KVERREL}
 /boot/xen-syms-%{KVERREL}
 %dir /lib/modules/%{KVERREL}xen
 /lib/modules/%{KVERREL}xen/kernel
@@ -1621,6 +1636,7 @@
 
 %changelog
 * Sat Jul 22 2006 Juan Quintela <quintela at redhat.com>
+- addia64-xen support, not enabled by default.
 - add ia64-xen config
 
 * Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com>