rpms/xen/devel .cvsignore, 1.30, 1.31 sources, 1.45, 1.46 xen-net-bridge.patch, 1.1, 1.2 xen.spec, 1.175, 1.176 xen-checkpoint-default.patch, 1.1, NONE xen-mem-pre-balloon.patch, 1.1, NONE

[Daniel P. Berrange (berrange)]

Author: berrange

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

Modified Files:
	.cvsignore sources xen-net-bridge.patch xen.spec 
Removed Files:
	xen-checkpoint-default.patch xen-mem-pre-balloon.patch 
Log Message:
Updated to xen 3.1.0 rc7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	1 May 2007 03:04:44 -0000	1.30
+++ .cvsignore	4 May 2007 14:14:50 -0000	1.31
@@ -1,2 +1,2 @@
 LibVNCServer-0.8.2.tar.gz
-xen-3.0.5-testing.hg-rc4.tar.gz
+xen-3.1.0-testing.hg-rc7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	1 May 2007 03:04:44 -0000	1.45
+++ sources	4 May 2007 14:14:50 -0000	1.46
@@ -1,2 +1,2 @@
 17a18e398af6c1730f72068022a152aa  LibVNCServer-0.8.2.tar.gz
-9159d457c35de26626a09f358eeb5faa  xen-3.0.5-testing.hg-rc4.tar.gz
+2d980c589c2428258b247d44e9bfa27a  xen-3.1.0-testing.hg-rc7.tar.gz

xen-net-bridge.patch:

Index: xen-net-bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-net-bridge.patch	1 May 2007 02:27:22 -0000	1.1
+++ xen-net-bridge.patch	4 May 2007 14:14:50 -0000	1.2
@@ -340,31 +340,6 @@
  }
  
  # Usage: add_to_bridge bridge dev
-diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/patches/qemu-target-i386-dm xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/patches/qemu-target-i386-dm
---- xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/patches/qemu-target-i386-dm	2007-04-23 19:21:23.000000000 -0400
-+++ xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/patches/qemu-target-i386-dm	2007-04-26 11:06:37.000000000 -0400
-@@ -1353,7 +1353,7 @@ Index: ioemu/target-i386-dm/qemu-ifup
- ===================================================================
- --- /dev/null	1970-01-01 00:00:00.000000000 +0000
- +++ ioemu/target-i386-dm/qemu-ifup	2006-12-08 01:41:11.000000000 +0000
--@@ -0,0 +1,10 @@
-+@@ -0,0 +1,16 @@
- +#!/bin/sh
- +
- +#. /etc/rc.d/init.d/functions
-@@ -1362,5 +1362,11 @@ Index: ioemu/target-i386-dm/qemu-ifup
- +echo -c 'config qemu network with xen bridge for '
- +echo $*
- +
-++bridge=$2
-++
-++if [ ! -e /sys/class/net/$bridge ]; then
-++    bridge=$(brctl show | sed -n '2s/[[:blank:]].*//p')
-++fi
-++
- +ifconfig $1 0.0.0.0 up
--+brctl addif $2 $1
-++brctl addif $bridge $1
 diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/target-i386-dm/qemu-ifup xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/target-i386-dm/qemu-ifup
 --- xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/target-i386-dm/qemu-ifup	2007-04-23 19:21:23.000000000 -0400
 +++ xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/target-i386-dm/qemu-ifup	2007-04-26 11:06:37.000000000 -0400


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- xen.spec	1 May 2007 15:14:27 -0000	1.175
+++ xen.spec	4 May 2007 14:14:50 -0000	1.176
@@ -2,19 +2,17 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 3.0.5
-Release: 0.rc4.4%{dist}
+Version: 3.1.0
+Release: 0.rc7.1%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-3.0.5-testing.hg-rc4.tar.gz
+Source0: %{name}-%{version}-testing.hg-rc7.tar.gz
 Source1: http://download.sf.net/libvncserver/LibVNCServer-0.8.2.tar.gz
 Patch1: xen-initscript.patch
 Patch2: xen-remove-python-path-check.patch
 Patch3: xen-compile-fixes.patch
 Patch6: xen-net-bridge.patch
-Patch7: xen-mem-pre-balloon.patch
-Patch8: xen-checkpoint-default.patch
 Patch13: xen-dumpdir.patch
 Patch18: xen-block-readonly.patch
 
@@ -95,13 +93,11 @@
 virtual machines. 
 
 %prep
-%setup -q -n xen-3.0.5-testing.hg-rc4 -a 1
+%setup -q -n %{name}-%{version}-testing.hg-rc7 -a 1
 %patch1 -p1 -b .init
 %patch2 -p1
 %patch3 -p1 -b .compile
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
 %patch13 -p1
 %patch18 -p1
 
@@ -247,6 +243,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu May  3 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-0.rc7.1.fc7
+- Updated to 3.1.0 rc7, changeset  15021 (upstream renumbered from 3.0.5)
+
 * Tue May  1 2007 Daniel P. Berrange <berrange at redhat.com> - 3.0.5-0.rc4.4.fc7
 - Fix op_save RPC API
 


--- xen-checkpoint-default.patch DELETED ---


--- xen-mem-pre-balloon.patch DELETED ---