rpms/xen/devel xen-change-default-nic.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.33, 1.34 xen-network-iptables-bridge.patch, 1.1, 1.2 xen-vmxballoon-hack.patch, 1.2, 1.3 xen.spec, 1.119, 1.120
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 13 17:25:10 UTC 2006
Author: sct
Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18310
Modified Files:
.cvsignore sources xen-network-iptables-bridge.patch
xen-vmxballoon-hack.patch xen.spec
Added Files:
xen-change-default-nic.patch
Log Message:
Update to xen-unstable cset 10675
Remove internal libvncserver build, new qemu device model has its own one
now.
Change default FV NIC model from rtl8139 to ne2k_pci until the former works
better
xen-change-default-nic.patch:
image.py | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xen-change-default-nic.patch ---
--- xen-unstable.hg/tools/python/xen/xend/image.py.~1~ 2006-07-13 15:39:11.000000000 +0100
+++ xen-unstable.hg/tools/python/xen/xend/image.py 2006-07-13 18:01:07.000000000 +0100
@@ -303,7 +303,7 @@
if mac == None:
mac = randomMAC()
bridge = sxp.child_value(info, 'bridge', 'xenbr0')
- model = sxp.child_value(info, 'model', 'rtl8139')
+ model = sxp.child_value(info, 'model', 'ne2k_pci')
ret.append("-net")
ret.append("nic,vlan=%d,macaddr=%s,model=%s" %
(nics, mac, model))
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 7 Jun 2006 14:04:13 -0000 1.18
+++ .cvsignore 13 Jul 2006 17:25:07 -0000 1.19
@@ -1,2 +1 @@
-LibVNCServer-0.7.1.tar.gz
-xen-unstable-10278.tar.bz2
+xen-unstable-10675.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 7 Jun 2006 14:04:13 -0000 1.33
+++ sources 13 Jul 2006 17:25:07 -0000 1.34
@@ -1,2 +1 @@
-54110288b3171551c03467cd60976d55 LibVNCServer-0.7.1.tar.gz
-3a9ceecf483dad0a29364b73b445636c xen-unstable-10278.tar.bz2
+7522262f0712687cb52c337553cab183 xen-unstable-10675.tar.bz2
xen-network-iptables-bridge.patch:
xen-network-common.sh | 3 +++
1 files changed, 3 insertions(+)
Index: xen-network-iptables-bridge.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-network-iptables-bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-network-iptables-bridge.patch 2 Feb 2006 22:24:14 -0000 1.1
+++ xen-network-iptables-bridge.patch 13 Jul 2006 17:25:07 -0000 1.2
@@ -1,9 +1,9 @@
---- xen-3.0.0/tools/examples/network-bridge.foo 2006-02-02 17:18:41.000000000 -0500
-+++ xen-3.0.0/tools/examples/network-bridge 2006-02-02 17:18:56.000000000 -0500
-@@ -158,6 +158,9 @@
+--- xen-unstable.hg/tools/examples/xen-network-common.sh.~1~ 2006-06-30 16:10:18.000000000 +0100
++++ xen-unstable.hg/tools/examples/xen-network-common.sh 2006-06-30 16:16:47.000000000 +0100
+@@ -127,6 +127,9 @@
# Don't create the bridge if it already exists.
- if ! brctl show | grep -q ${bridge} ; then
+ if [ ! -e "/sys/class/net/${bridge}/bridge" ]; then
+ sysctl -w "net.bridge.bridge-nf-call-arptables=0"
+ sysctl -w "net.bridge.bridge-nf-call-ip6tables=0"
+ sysctl -w "net.bridge.bridge-nf-call-iptables=0"
xen-vmxballoon-hack.patch:
XendDomainInfo.py | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
Index: xen-vmxballoon-hack.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-vmxballoon-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-vmxballoon-hack.patch 8 Feb 2006 21:18:36 -0000 1.2
+++ xen-vmxballoon-hack.patch 13 Jul 2006 17:25:07 -0000 1.3
@@ -1,7 +1,7 @@
---- xen-3.0.0/tools/python/xen/xend/XendDomainInfo.py.vmxballoon 2006-02-07 17:45:12.000000000 -0500
-+++ xen-3.0.0/tools/python/xen/xend/XendDomainInfo.py 2006-02-07 17:44:50.000000000 -0500
-@@ -1182,7 +1182,13 @@
- xc.vcpu_setaffinity(self.domid, v, cpu)
+--- xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py.~1~ 2006-07-13 15:51:46.000000000 +0100
++++ xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py 2006-07-13 15:56:15.000000000 +0100
+@@ -1281,7 +1281,13 @@
+ xc.domain_setmaxmem(self.domid, self.info['maxmem'] * 1024)
m = self.image.getDomainMemory(self.info['memory'] * 1024)
- balloon.free(m)
@@ -12,6 +12,6 @@
+ if self.image.ostype == "hvm":
+ fudge = 1026 * 4 # 1 meg of video ram + pt
+ balloon.free(m + fudge)
- xc.domain_setmaxmem(self.domid, m)
- xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
+ init_reservation = self.info['memory'] * 1024
+ if os.uname()[4] == 'ia64':
Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- xen.spec 11 Jul 2006 13:52:53 -0000 1.119
+++ xen.spec 13 Jul 2006 17:25:07 -0000 1.120
@@ -1,19 +1,17 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define libvncver 0.7.1
-
Summary: Xen is a virtual machine monitor
Name: xen
Version: 3.0.2
-Release: 12
+Release: 13
Group: Development/Libraries
License: GPL
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-unstable-10278.tar.bz2
-Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
+Source0: xen-unstable-10675.tar.bz2
Source2: xenguest-install.py
Source3: xen-udev.rules
Patch1: xen-initscript.patch
+Patch2: xen-change-default-nic.patch
Patch6: xen-network-iptables-bridge.patch
Patch8: xen-vmxballoon-hack.patch
Patch11: xen-3.0.1-cloexec.patch
@@ -77,8 +75,9 @@
virtual machines.
%prep
-%setup -q -n xen-unstable.hg -a 1
+%setup -q -n xen-unstable.hg
%patch1 -p1 -b .init
+%patch2 -p1 -b .nic
%patch6 -p1
%patch8 -p1
#patch11 -p1 -b .cloexec
@@ -91,13 +90,6 @@
cp %{SOURCE2} .
%build
-pushd LibVNCServer-%{libvncver}
-%configure
-make
-vncdir=`pwd`
-popd
-
-sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/ioemu/configure
CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
%install
@@ -198,6 +190,13 @@
%{_libdir}/*.a
%changelog
+* Thu Jul 13 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-13
+- Update to xen-unstable cset 10675
+- Remove internal libvncserver build, new qemu device model has its own one
+ now.
+- Change default FV NIC model from rtl8139 to ne2k_pci until the former works
+ better
+
* Tue Jul 11 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-12
- bump libvirt requires to 0.1.2
- drop xend httpd localhost server and use the unix socket instead
More information about the fedora-cvs-commits
mailing list