rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.53, 1.54 xen-compile-fix.patch, 1.2, 1.3 xen-version-strings.patch, 1.3, 1.4

[Eduardo Habkost (ehabkost)]

Author: ehabkost

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

Modified Files:
	kernel-xen.spec xen-compile-fix.patch 
	xen-version-strings.patch 
Log Message:
Make hypervisor patches relative to the xen HG tree

Make hypervisor patches relative to the xen HG tree, not only the
'xen' subdirectory. This makes easier to import patches from
upstream.



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kernel-xen.spec	12 Sep 2007 20:21:05 -0000	1.53
+++ kernel-xen.spec	13 Sep 2007 19:20:29 -0000	1.54
@@ -1438,11 +1438,12 @@
   rm -rf xen
 fi
 %setup -D -T -q -n kernel-%{version} -a1
-cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen
+cd xen-%{xen_hv_version}-%{xen_hv_cset}/
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
 
+cd xen/
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
 sed -i -e 's/\(^export XEN_BUILDVERSION.*$\)/\1'-%{PACKAGE_RELEASE}'/' Makefile
@@ -2363,6 +2364,11 @@
 #  - tux.
 
 %changelog
+* Thu Sep 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Make hypervisor patches relative to the xen HG tree, not only the
+  hypervisor subdirectory. This makes easier to import patches from
+  upstream.
+
 * Wed Sep 12 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable CONFIG_HIGHPTE. It is not reliable and cause performance loss
   under Xen.

xen-compile-fix.patch:

Index: xen-compile-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/xen-compile-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-compile-fix.patch	30 Apr 2007 22:09:41 -0000	1.2
+++ xen-compile-fix.patch	13 Sep 2007 19:20:29 -0000	1.3
@@ -1,7 +1,7 @@
-Index: xen/include/asm-x86/hvm/hvm.h
+Index: xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
 ===================================================================
---- xen.orig/include/asm-x86/hvm/hvm.h
-+++ xen/include/asm-x86/hvm/hvm.h
+--- xen-3.1.0/xen/include/asm-x86/hvm/hvm.h
++++ xen-3.1.0/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);
  }

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-version-strings.patch	7 May 2007 18:47:08 -0000	1.3
+++ xen-version-strings.patch	13 Sep 2007 19:20:29 -0000	1.4
@@ -1,7 +1,7 @@
-Index: xen/Makefile
+Index: xen-3.1.0/xen/Makefile
 ===================================================================
---- xen.orig/Makefile
-+++ xen/Makefile
+--- xen-3.1.0/xen/Makefile
++++ xen-3.1.0/xen/Makefile
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3