rpms/kernel-xen-2.6/devel .cvsignore, 1.9, 1.10 kernel.spec, 1.6, 1.7 sources, 1.9, 1.10 xen-version-strings.patch, 1.5, 1.6 xen-vmx-fpu-ts-fix.patch, 1.1, NONE xen-vpic-irqbase-mode.patch, 1.1, NONE

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8442

Modified Files:
	.cvsignore kernel.spec sources xen-version-strings.patch 
Removed Files:
	xen-vmx-fpu-ts-fix.patch xen-vpic-irqbase-mode.patch 
Log Message:
Update Xen HV to 3.2.0 rc5, changeset 16701


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Nov 2007 20:13:07 -0000	1.9
+++ .cvsignore	11 Jan 2008 02:57:00 -0000	1.10
@@ -1,4 +1,4 @@
 linux-2.6.21.tar.bz2
 patch-2.6.21.7.bz2
 linux-2.6.21.7-xen-3.1.0.patch.bz2
-xen-3.1.0-src.tgz
+xen-unstable-16701.tgz


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kernel.spec	19 Nov 2007 12:03:07 -0000	1.6
+++ kernel.spec	11 Jan 2008 02:57:00 -0000	1.7
@@ -189,7 +189,8 @@
 %define make_target bzImage
 
 %define xen_hv_version 3.1.0
-%define xen_hv_dirname xen-%{xen_hv_version}-src
+#define xen_hv_dirname xen-%{xen_hv_version}-src
+%define xen_hv_dirname xen-unstable-16701
 %define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
@@ -457,7 +458,7 @@
 %define kernel_xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
 
 # xen-hypervisor-abi provides (bug #269581)
-%define kernel_xen_provides xen-hypervisor-abi = 3.1
+%define kernel_xen_provides xen-hypervisor-abi = 3.2
 
 # upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise
 # now that the smp kernel offers this capability, obsolete the old kernel
@@ -542,7 +543,8 @@
 %endif
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-%{xen_hv_version}-src.tgz
+#Source1: xen-%{xen_hv_version}-src.tgz
+Source1: xen-unstable-16701.tgz
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -929,13 +931,6 @@
 Patch20000: xen-compile-fix.patch
 Patch20001: xen-version-strings.patch
 
-# Fix graphical boot (e.g. F7 DVD booting) under Full Virtualization
-Patch20002: xen-vpic-irqbase-mode.patch
-
-# Fix bz#294011: floating point corruption issues
-# changeset 8c24767501ff from Xen 3.1.1
-Patch20003: xen-vmx-fpu-ts-fix.patch
-
 # Xen ld --build-id option
 # (http://fedoraproject.org/wiki/Releases/FeatureBuildId)
 Patch20004: xen-build-id.patch
@@ -1753,8 +1748,6 @@
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
-%patch20002 -p1
-%patch20003 -p1
 %patch20004 -p1
 %patch20005 -p1
 
@@ -2280,6 +2273,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Jan 10 2008 Daniel P. Berrange <berrange at redhat.com>
+- Update HV to 3.2.0 rc5 changeset 16701
+
 * Mon Nov 19 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Re-add xen-hypervisor-abi provides. It was lost on the spec resync
   (problem detected on updates-testing)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Nov 2007 20:13:07 -0000	1.9
+++ sources	11 Jan 2008 02:57:00 -0000	1.10
@@ -1,4 +1,4 @@
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
 b9c8734471a454806c77f040fcf9869b  patch-2.6.21.7.bz2
 0b7a1468bcd3353b77494cbf0e97d2e4  linux-2.6.21.7-xen-3.1.0.patch.bz2
-b7ae1f652b071862ae4c90b72d549627  xen-3.1.0-src.tgz
+352aa610761be3cae89f9e7caa4f0feb  xen-unstable-16701.tgz

xen-version-strings.patch:

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xen-version-strings.patch	14 Nov 2007 20:13:07 -0000	1.5
+++ xen-version-strings.patch	11 Jan 2008 02:57:00 -0000	1.6
@@ -1,12 +1,11 @@
-Index: xen-3.1.0/xen/Makefile
-===================================================================
---- xen-3.1.0/xen/Makefile
-+++ xen-3.1.0/xen/Makefile
+diff -rup xen-unstable-16701.orig/xen/Makefile xen-unstable-16701.new/xen/Makefile
+--- xen-unstable-16701.orig/xen/Makefile	2008-01-10 16:20:12.000000000 -0500
++++ xen-unstable-16701.new/xen/Makefile	2008-01-10 16:18:53.000000000 -0500
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3
- export XEN_SUBVERSION    = 1
--export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION)
+ export XEN_SUBVERSION    = 2
+-export XEN_EXTRAVERSION ?= .0-rc5$(XEN_VENDORVERSION)
 +export XEN_BASEVERSION  ?= .0$(XEN_VENDORVERSION)
 +export XEN_BUILDER      ?= 
 +export XEN_BUILDVERSION ?= 
@@ -15,7 +14,7 @@
  export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
  -include xen-version
  
-@@ -114,7 +118,7 @@ include/xen/compile.h: include/xen/compi
+@@ -101,7 +105,7 @@ include/xen/compile.h: include/xen/compi
  	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
  	    -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} {rev}:{node|short}") || echo "unavailable") 2>/dev/null)!g' \
  	    < include/xen/compile.h.in > $@.new


--- xen-vmx-fpu-ts-fix.patch DELETED ---


--- xen-vpic-irqbase-mode.patch DELETED ---