rpms/kernel-xen-2.6/devel .cvsignore, 1.3, 1.3.4.1 kernel-xen.spec, 1.18, 1.18.4.1 sources, 1.3, 1.3.4.1 xen-compile-fix.patch, 1.1, 1.1.4.1 xen-version-strings.patch, 1.1, 1.1.4.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 26 19:54:28 UTC 2007


Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	.cvsignore kernel-xen.spec sources xen-compile-fix.patch 
	xen-version-strings.patch 
Log Message:
Updating xen HV to 3.0.5-rc3

As requested by danpb




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- .cvsignore	22 Mar 2007 16:01:16 -0000	1.3
+++ .cvsignore	26 Apr 2007 19:54:26 -0000	1.3.4.1
@@ -3,3 +3,4 @@
 xen-3.0.4-13132.tar.bz2
 linux-2.6.20.tar.bz2
 patch-2.6.20.3.bz2
+xen-3.0.5-rc3-14934.tar.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- kernel-xen.spec	22 Mar 2007 17:44:34 -0000	1.18
+++ kernel-xen.spec	26 Apr 2007 19:54:26 -0000	1.18.4.1
@@ -37,7 +37,7 @@
 %define make_target bzImage
 %define kernel_image x86
 
-%define xen_hv_cset 13132
+%define xen_hv_cset 14934
 %define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
@@ -255,7 +255,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-3.0.4-%{xen_hv_cset}.tar.bz2
+Source1: xen-3.0.5-rc3-%{xen_hv_cset}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- sources	22 Mar 2007 16:01:16 -0000	1.3
+++ sources	26 Apr 2007 19:54:26 -0000	1.3.4.1
@@ -3,3 +3,4 @@
 ec35d2aa26cb452832761ff7ce9c4583  xen-3.0.4-13132.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 30764d4152c727b8ec7b709ab5464ec3  patch-2.6.20.3.bz2
+813405b30fba1ce41fedd5756f08b16b  xen-3.0.5-rc3-14934.tar.bz2

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

Index: xen-compile-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-compile-fix.patch,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- xen-compile-fix.patch	24 Jan 2007 01:28:48 -0000	1.1
+++ xen-compile-fix.patch	26 Apr 2007 19:54:26 -0000	1.1.4.1
@@ -1,6 +1,8 @@
---- xen/include/asm-x86/hvm/hvm.h.orig	2007-01-23 02:19:41.000000000 +0100
-+++ xen/include/asm-x86/hvm/hvm.h	2007-01-23 02:18:29.000000000 +0100
-@@ -170,7 +170,7 @@ hvm_long_mode_enabled(struct vcpu *v)
+Index: xen/include/asm-x86/hvm/hvm.h
+===================================================================
+--- xen.orig/include/asm-x86/hvm/hvm.h
++++ xen/include/asm-x86/hvm/hvm.h
+@@ -183,7 +183,7 @@ hvm_long_mode_enabled(struct vcpu *v)
      return hvm_funcs.long_mode_enabled(v);
  }
  #else

xen-version-strings.patch:
 Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- xen-version-strings.patch	24 Jan 2007 01:28:48 -0000	1.1
+++ xen-version-strings.patch	26 Apr 2007 19:54:26 -0000	1.1.4.1
@@ -1,11 +1,13 @@
---- xen/Makefile.orig	2007-01-14 22:08:05.000000000 +0100
-+++ xen/Makefile	2007-01-23 01:13:35.000000000 +0100
+Index: xen/Makefile
+===================================================================
+--- xen.orig/Makefile
++++ xen/Makefile
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3
  export XEN_SUBVERSION    = 0
--export XEN_EXTRAVERSION ?= .4-1$(XEN_VENDORVERSION)
-+export XEN_BASEVERSION  ?= .4-1$(XEN_VENDORVERSION)
+-export XEN_EXTRAVERSION ?= .5-rc3$(XEN_VENDORVERSION)
++export XEN_BASEVERSION  ?= .5-rc3$(XEN_VENDORVERSION)
 +export XEN_BUILDER      ?= 
 +export XEN_BUILDVERSION ?= 
 +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION)
@@ -13,7 +15,7 @@
  export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
  -include xen-version
  
-@@ -108,8 +112,8 @@ include/xen/compile.h: include/xen/compi
+@@ -114,7 +118,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




More information about the fedora-cvs-commits mailing list