rpms/xen/devel .cvsignore, 1.25, 1.26 sources, 1.40, 1.41 xen-blktap-patches.patch, 1.1, 1.2 xen-compile-fixes.patch, 1.5, 1.6 xen.spec, 1.152, 1.153

Thu Sep 28 23:14:18 UTC 2006

Author: sct

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

Modified Files:
	.cvsignore sources xen-blktap-patches.patch 
	xen-compile-fixes.patch xen.spec 
Log Message:
Update to xen-3.0.3-testing changeset 11633


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26

--- .cvsignore	20 Sep 2006 21:51:09 -0000	1.25
+++ .cvsignore	28 Sep 2006 23:14:16 -0000	1.26
@@ -1,2 +1,2 @@
 LibVNCServer-0.8.2.tar.gz
-xen-unstable-11539.tar.bz2
+xen-3.0.3-testing-11633.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	20 Sep 2006 21:51:09 -0000	1.40
+++ sources	28 Sep 2006 23:14:16 -0000	1.41
@@ -1,2 +1,2 @@
 17a18e398af6c1730f72068022a152aa  LibVNCServer-0.8.2.tar.gz
-86677a4e84c51b59bca37e06ed407bf6  xen-unstable-11539.tar.bz2
+eceb97db9b1c35dedcf4cf315da637ce  xen-3.0.3-testing-11633.tar.bz2

xen-blktap-patches.patch:
 linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c |    1 
 tools/blktap/drivers/blktapctrl.c                |   44 +++++++++++++++++++++--
 tools/blktap/lib/blktaplib.h                     |    2 +
 tools/examples/xen-backend.rules                 |    1 
 tools/python/xen/util/blkif.py                   |    4 +-
 5 files changed, 48 insertions(+), 4 deletions(-)

Index: xen-blktap-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-blktap-patches.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-blktap-patches.patch	28 Sep 2006 22:48:54 -0000	1.1
+++ xen-blktap-patches.patch	28 Sep 2006 23:14:16 -0000	1.2
@@ -101,7 +101,7 @@
      if uname.find(":") != -1:
 -        (typ, fn) = uname.split(":")
 +        (typ, fn) = uname.split(":", 1)
-         if typ == "phy" and not fn.startswith("/dev/"):
+         if typ == "phy" and not fn.startswith("/"):
              fn = "/dev/%s" %(fn,)
 +        if typ == "tap":
 +            (typ, fn) = fn.split(":", 1)

xen-compile-fixes.patch:
 Config.mk                     |    2 +-
 tools/blktap/drivers/Makefile |    6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

Index: xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-compile-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xen-compile-fixes.patch	20 Sep 2006 21:51:09 -0000	1.5
+++ xen-compile-fixes.patch	28 Sep 2006 23:14:16 -0000	1.6
@@ -1,13 +1,3 @@
---- xen-unstable-11234/tools/ioemu/usb-linux.c.compile	2006-08-23 16:20:15.000000000 -0400
-+++ xen-unstable-11234/tools/ioemu/usb-linux.c	2006-08-23 16:21:25.000000000 -0400
-@@ -26,7 +26,6 @@
- #if defined(__linux__)
- #include <dirent.h>
- #include <sys/ioctl.h>
--#include <linux/compiler.h>
- #include <linux/usbdevice_fs.h>
- #include <linux/version.h>
- 
 --- xen-unstable-11234/tools/blktap/drivers/Makefile.compile	2006-08-23 06:27:06.000000000 -0400
 +++ xen-unstable-11234/tools/blktap/drivers/Makefile	2006-08-23 16:16:28.000000000 -0400
 @@ -10,12 +10,6 @@
@@ -34,13 +24,3 @@
  
  AS         = $(CROSS_COMPILE)as
  LD         = $(CROSS_COMPILE)ld
---- xen-unstable-11539/tools/libxc/xc_ptrace.c.~1~	2006-09-20 13:56:32.000000000 +0100
-+++ xen-unstable-11539/tools/libxc/xc_ptrace.c	2006-09-20 22:26:56.000000000 +0100
-@@ -617,6 +617,7 @@
-     case PTRACE_POKEUSER:
-     case PTRACE_SYSCALL:
-     case PTRACE_KILL:
-+    default:
-         goto out_unsupported; /* XXX not yet supported */
- 
-     case PTRACE_TRACEME:


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- xen.spec	28 Sep 2006 22:48:54 -0000	1.152
+++ xen.spec	28 Sep 2006 23:14:16 -0000	1.153
@@ -1,15 +1,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define changeset 11539
+%define changeset 11633
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 40
+Release: 41
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-unstable-%{changeset}.tar.bz2
+Source0: xen-3.0.3-testing-%{changeset}.tar.bz2
 Source1: http://download.sf.net/libvncserver/LibVNCServer-0.8.2.tar.gz
 Patch1: xen-initscript.patch
 Patch2: xen-nostrip-ioemu.patch
@@ -90,7 +90,7 @@
 virtual machines. 
 
 %prep
-%setup -q -n xen-unstable-%{changeset} -a 1
+%setup -q -n xen-3.0.3-testing-%{changeset} -a 1
 %patch1 -p1 -b .init
 # Don't strip qemu-dm early, so that we get proper debuginfo
 %patch2 -p1
@@ -225,6 +225,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Sep 28 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-41
+- Update to xen-3.0.3-testing changeset 11633
+
 * Thu Sep 28 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-40
 - Workaround blktap/xenstore startup race
 - Add udev rules for xen blktap devices (srostedt)


