rpms/kernel-xen/devel xen-gcc-4.1-compile-fix.patch, NONE, 1.1 kernel-xen.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-gcc-4.1-compile-fix.patch 
Log Message:
enable gcc-4.1 & debug options for hypervisor

xen-gcc-4.1-compile-fix.patch:
 mpspec_def.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-gcc-4.1-compile-fix.patch ---
diff -uNp xen/include/asm-x86/mpspec_def.h.orig xen/include/asm-x86/mpspec_def.h
--- xen/include/asm-x86/mpspec_def.h.orig	2006-02-07 21:24:36.000000000 +0100
+++ xen/include/asm-x86/mpspec_def.h	2006-02-07 21:24:48.000000000 +0100
@@ -75,7 +75,7 @@ struct mpc_config_bus
 {
 	unsigned char mpc_type;
 	unsigned char mpc_busid;
-	unsigned char mpc_bustype[6] __attribute((packed));
+	unsigned char mpc_bustype[6];
 };
 
 /* List of Bus Type string values, Intel MP Spec. */


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kernel-xen.spec	7 Feb 2006 12:26:01 -0000	1.42
+++ kernel-xen.spec	7 Feb 2006 20:37:35 -0000	1.43
@@ -6,7 +6,7 @@
 %define buildup 0
 %define buildsmp 0
 %define includexen 1
-%define includexenPAE 1
+%define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
 
@@ -184,7 +184,6 @@
 BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
-BuildRequires: compat-gcc-32
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 
@@ -411,6 +410,8 @@
 # Do not add anything non-trivial here.
 Patch10001: linux-2.6-random-patches.patch
 
+Patch20000: xen-gcc-4.1-compile-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -685,6 +686,12 @@
   fi
 fi
 cp -rl vanilla linux-%{kversion}.%{_target_cpu}
+
+%if %{buildxen}
+cd xen
+%patch20000 -p1
+cd ..
+%endif
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
@@ -1227,12 +1234,12 @@
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
 %if %{buildxenPAE}
-  make CC=gcc32 pae=y
+  make debug=y verbose=y crash_debug=y pae=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
   make clean
 %endif
-  make CC=gcc32
+  make debug=y verbose=y crash_debug=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
@@ -1584,7 +1591,12 @@
 %endif
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 166: Tag takes single token only: Release: :.1 1.41_FC5.jkeating
+* Tue Feb  7 2006 Juan Quintela <quintela at redhat.com>
+- fix xen to compile with gcc-4.1.
+- disable PAE build.
+- enable debug hypervisor options.
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Feb  6 2006 Juan Quintela <quintela at redhat.com>