rpms/kernel-xen-2.6/F-8 .cvsignore, 1.8, 1.9 kernel.spec, 1.7, 1.8 sources, 1.8, 1.9 xen-version-strings.patch, 1.4, 1.5 xen-vmx-fpu-ts-fix.patch, 1.1, NONE xen-vpic-irqbase-mode.patch, 1.1, NONE

Thu Mar 20 18:42:41 UTC 2008

Author: markmc

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4948

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:
* Thu Mar 20 2008 Mark McLoughlin <markmc at redhat.com>
- Update HV to 3.1.1; fixes pv_ops 32-on-64 (bug #436859)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	13 Sep 2007 23:14:06 -0000	1.8
+++ .cvsignore	20 Mar 2008 18:42:00 -0000	1.9
@@ -1,4 +1,4 @@
-xen-3.1.0-rc7-7041b52471c3.tar.bz2
+xen-3.1.3.tar.bz2
 linux-2.6.21.tar.bz2
 patch-2.6.21.7.bz2
 linux-2.6.21.7-xen-3.1.0.patch.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-8/kernel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kernel.spec	15 Feb 2008 17:03:36 -0000	1.7
+++ kernel.spec	20 Mar 2008 18:42:00 -0000	1.8
@@ -189,8 +189,7 @@
 
 %define make_target bzImage
 
-%define xen_hv_version 3.1.0-rc7
-%define xen_hv_cset 7041b52471c3
+%define xen_hv_version 3.1.3
 %define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
@@ -543,7 +542,7 @@
 %endif
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-%{xen_hv_version}-%{xen_hv_cset}.tar.bz2
+Source1: xen-%{xen_hv_version}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -948,22 +947,12 @@
 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
+Patch20002: xen-build-id.patch
 
 # Include build-id notes on xen-syms
-Patch20005: xen-syms-build-id.patch
-
-
-
+Patch20003: xen-syms-build-id.patch
 
 %endif
 
@@ -1784,14 +1773,12 @@
   rm -rf xen
 fi
 %setup -D -T -q -n kernel-%{kversion} -a1
-cd xen-%{xen_hv_version}-%{xen_hv_cset}/
+cd xen-%{xen_hv_version}/
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
 %patch20002 -p1
 %patch20003 -p1
-%patch20004 -p1
-%patch20005 -p1
 
 %endif
 
@@ -2012,7 +1999,7 @@
 
 %if %{includexen}
 %if %{with_xen}
-  cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen/
+  cd xen-%{xen_hv_version}/xen/
   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}
@@ -2315,6 +2302,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Mar 20 2008 Mark McLoughlin <markmc at redhat.com>
+- Update HV to 3.1.1; fixes pv_ops 32-on-64 (bug #436859)
+
 * Fri Feb 15 2008 Mark McLoughlin <markmc at redhat.com>
 - Add e1000e driver (bug #360691)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Sep 2007 23:14:06 -0000	1.8
+++ sources	20 Mar 2008 18:42:00 -0000	1.9
@@ -1,4 +1,4 @@
-b73a966a55f3907020a1a29b4e2df64d  xen-3.1.0-rc7-7041b52471c3.tar.bz2
+04f77fd5ca137cb4feacaa068caac751  xen-3.1.3.tar.bz2
 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

xen-version-strings.patch:

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-8/xen-version-strings.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xen-version-strings.patch	13 Sep 2007 19:20:29 -0000	1.4
+++ xen-version-strings.patch	20 Mar 2008 18:42:00 -0000	1.5
@@ -1,15 +1,14 @@
-Index: xen-3.1.0/xen/Makefile
-===================================================================
---- xen-3.1.0/xen/Makefile
-+++ xen-3.1.0/xen/Makefile
+diff -up xen-3.1.3/xen/Makefile.version-strings xen-3.1.3/xen/Makefile
+--- xen-3.1.3/xen/Makefile.version-strings	2008-01-31 10:06:54.000000000 +0000
++++ xen-3.1.3/xen/Makefile	2008-03-20 18:34:54.000000000 +0000
 @@ -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-rc7$(XEN_VENDORVERSION)
-+export XEN_BASEVERSION  ?= .0-rc7$(XEN_VENDORVERSION)
-+export XEN_BUILDER      ?= 
-+export XEN_BUILDVERSION ?= 
+-export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION)
++export XEN_BASEVERSION  ?= .3$(XEN_VENDORVERSION)
++export XEN_BUILDER      ?=
++export XEN_BUILDVERSION ?=
 +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION)
 +export XEN_SHORTVERSION  = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_BASEVERSION)$(XEN_BUILDER)
  export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)


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


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


