rpms/xen/devel .cvsignore, 1.44, 1.45 sources, 1.59, 1.60 xen-dumpdir.patch, 1.5, 1.6 xen-initscript.patch, 1.12, 1.13 xen.spec, 1.253, 1.254
myoung
myoung at fedoraproject.org
Mon Jun 7 22:28:19 UTC 2010
Author: myoung
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14674
Modified Files:
.cvsignore sources xen-dumpdir.patch xen-initscript.patch
xen.spec
Log Message:
update to xen 4.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore 1 Jun 2010 18:18:47 -0000 1.44
+++ .cvsignore 7 Jun 2010 22:28:18 -0000 1.45
@@ -5,4 +5,4 @@ newlib-1.16.0.tar.gz
lwip-1.3.0.tar.gz
pciutils-2.2.9.tar.bz2
zlib-1.2.3.tar.gz
-xen-3.4.3.tar.gz
+xen-4.0.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources 1 Jun 2010 18:18:47 -0000 1.59
+++ sources 7 Jun 2010 22:28:18 -0000 1.60
@@ -3,4 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4 newlib
36cc57650cffda9a0269493be2a169bb lwip-1.3.0.tar.gz
cec05e7785497c5e19da2f114b934ffd pciutils-2.2.9.tar.bz2
debc62758716a169df9f62e6ab2bc634 zlib-1.2.3.tar.gz
-cbe84c44bc156ad1b4a20dc1c73464b8 xen-3.4.3.tar.gz
+b147fe56d035c497c99898243aae8937 xen-4.0.0.tar.gz
xen-dumpdir.patch:
xen-3.4.0/tools/Makefile | 2 +-
xen-3.4.0/tools/debugger/gdb/README | 2 +-
xen-4.0.0/tools/python/xen/xend/XendDomainInfo.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: xen-dumpdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-dumpdir.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xen-dumpdir.patch 27 May 2009 16:24:01 -0000 1.5
+++ xen-dumpdir.patch 7 Jun 2010 22:28:18 -0000 1.6
@@ -9,7 +9,7 @@ diff -up xen-3.4.0/tools/Makefile.dump x
+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump
$(INSTALL_DIR) $(DESTDIR)/var/log/xen
$(INSTALL_DIR) $(DESTDIR)/var/lib/xen
-
+ $(INSTALL_DIR) $(DESTDIR)/var/lock/subsys
diff -up xen-3.4.0/tools/debugger/gdb/README.dump xen-3.4.0/tools/debugger/gdb/README
--- xen-3.4.0/tools/debugger/gdb/README.dump 2009-05-18 13:05:38.000000000 +0200
+++ xen-3.4.0/tools/debugger/gdb/README 2009-05-20 17:03:26.000000000 +0200
@@ -21,15 +21,23 @@ diff -up xen-3.4.0/tools/debugger/gdb/RE
+ '/var/lib/xen/dump/<domain-name>.<domain-id>.core'.
3. Run 'gdbserver-xen 127.0.0.1:9999 --file <core-file>'.
4. Connect to the server as for a running guest.
-diff -up xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py
---- xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump 2009-05-18 13:05:38.000000000 +0200
-+++ xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py 2009-05-20 17:03:56.000000000 +0200
-@@ -2096,7 +2096,7 @@ class XendDomainInfo:
-
- if not corefile:
+--- xen-4.0.0/tools/python/xen/xend/XendDomainInfo.py.orig 2010-02-02 20:43:01.000000000 +0000
++++ xen-4.0.0/tools/python/xen/xend/XendDomainInfo.py 2010-02-02 21:36:57.000000000 +0000
+@@ -2287,7 +2287,7 @@
+ # To prohibit directory traversal
+ based_name = os.path.basename(self.info['name_label'])
+
+- coredir = "/var/xen/dump/%s" % (based_name)
++ coredir = "/var/lib/xen/dump/%s" % (based_name)
+ if not os.path.exists(coredir):
+ try:
+ mkdir.parents(coredir, stat.S_IRWXU)
+@@ -2296,7 +2296,7 @@
+
+ if not os.path.isdir(coredir):
+ # Use former directory to dump core
+- coredir = '/var/xen/dump'
++ coredir = '/var/lib/xen/dump'
+
this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
-- corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time,
-+ corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time,
- self.info['name_label'], self.domid)
-
- if os.path.isdir(corefile):
+ corefile = "%s/%s-%s.%s.core" % (coredir, this_time,
xen-initscript.patch:
xen-3.4.0/tools/python/xen/xend/osdep.py | 2
xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py | 9 +
xen-4.0.0/tools/misc/xend | 137 --------------------
3 files changed, 10 insertions(+), 138 deletions(-)
Index: xen-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-initscript.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xen-initscript.patch 27 May 2009 16:24:01 -0000 1.12
+++ xen-initscript.patch 7 Jun 2010 22:28:18 -0000 1.13
@@ -1,7 +1,6 @@
-diff -up xen-3.4.0/tools/misc/xend.fix xen-3.4.0/tools/misc/xend
---- xen-3.4.0/tools/misc/xend.fix 2009-05-20 15:39:12.000000000 +0200
-+++ xen-3.4.0/tools/misc/xend 2009-05-20 15:40:32.000000000 +0200
-@@ -8,140 +8,16 @@
+--- xen-4.0.0/tools/misc/xend.orig 2010-02-02 20:43:01.000000000 +0000
++++ xen-4.0.0/tools/misc/xend 2010-02-02 21:16:13.000000000 +0000
+@@ -8,151 +8,16 @@
"""Xen management daemon.
Provides console server and HTTP management api.
@@ -104,6 +103,14 @@ diff -up xen-3.4.0/tools/misc/xend.fix x
-def start_blktapctrl():
- start_daemon("blktapctrl", "")
-
+-def start_xenbackendd():
+- XENBACKENDD_DEBUG = os.getenv("XENBACKENDD_DEBUG")
+- args = ""
+- if XENBACKENDD_DEBUG:
+- args += "-d"
+- if os.uname()[0] == 'NetBSD':
+- start_daemon("xenbackendd", args)
+-
def main():
- try:
- check_logging()
@@ -118,11 +125,13 @@ diff -up xen-3.4.0/tools/misc/xend.fix x
- if os.uname()[0] != "SunOS":
- start_xenstored()
- start_consoled()
+- start_xenbackendd()
- start_blktapctrl()
- return daemon.start()
- elif sys.argv[1] == 'trace_start':
- start_xenstored()
- start_consoled()
+- start_xenbackendd()
- start_blktapctrl()
- return daemon.start(trace=1)
- elif sys.argv[1] == 'stop':
@@ -132,6 +141,7 @@ diff -up xen-3.4.0/tools/misc/xend.fix x
- elif sys.argv[1] == 'restart':
- start_xenstored()
- start_consoled()
+- start_xenbackendd()
- start_blktapctrl()
- return daemon.stop() or daemon.start()
- elif sys.argv[1] == 'status':
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- xen.spec 1 Jun 2010 18:18:47 -0000 1.253
+++ xen.spec 7 Jun 2010 22:28:18 -0000 1.254
@@ -1,16 +1,16 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# Hypervisor ABI
-%define hv_abi 3.4
+%define hv_abi 4.0
Summary: Xen is a virtual machine monitor
Name: xen
-Version: 3.4.3
+Version: 4.0.0
Release: 1%{?dist}
Group: Development/Libraries
License: GPLv2+ and LGPLv2+ and BSD
URL: http://xen.org/
-Source0: http://bits.xensource.com/oss-xen/release/3.4.0/xen-%{version}.tar.gz
+Source0: http://bits.xensource.com/oss-xen/release/4.0.0/xen-%{version}.tar.gz
Source1: %{name}.modules
Source2: %{name}.logrotate
Source3: dom0-kernel.repo
@@ -58,6 +58,10 @@ BuildRequires: gnutls-devel
BuildRequires: openssl-devel
# For ioemu PCI passthrough
BuildRequires: pciutils-devel
+# Several tools now use uuid
+BuildRequires: libuuid-devel
+# iasl needed to build hvmloader
+BuildRequires: iasl
# modern compressed kernels
BuildRequires: bzip2-devel xz-devel
# libfsimage
@@ -174,8 +178,8 @@ find %{buildroot} -print | xargs ls -ld
rm -rf %{buildroot}/usr/*-xen-elf
# hypervisor symlinks
-rm -rf %{buildroot}/boot/xen-3.4.gz
-rm -rf %{buildroot}/boot/xen-3.gz
+rm -rf %{buildroot}/boot/xen-4.0.gz
+rm -rf %{buildroot}/boot/xen-4.gz
# silly doc dir fun
rm -fr %{buildroot}%{_datadir}/doc/xen
@@ -234,6 +238,9 @@ install -m 644 %{SOURCE30} %{buildroot}%
install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled
install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
+# config file only used for hotplug, Fedora uses udev instead
+rm -f %{buildroot}/%{_sysconfdir}/sysconfig/xend
+
############ create dirs in /var ############
mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/domain
@@ -303,6 +310,7 @@ rm -rf %{buildroot}
%{_mandir}/man1/xm.1*
%{_mandir}/man5/xend-config.sxp.5*
%{_mandir}/man5/xmdomain.cfg.5*
+%{_datadir}/%{name}/create.dtd
# Startup script
%{_sysconfdir}/rc.d/init.d/xend
@@ -341,7 +349,6 @@ rm -rf %{buildroot}
%dir %attr(0700,root,root) %{_sysconfdir}/%{name}
%dir %attr(0700,root,root) %{_sysconfdir}/%{name}/scripts/
%config %attr(0700,root,root) %{_sysconfdir}/%{name}/scripts/*
-%config %attr(0700,root,root) %{_sysconfdir}/%{name}/qemu-ifup
%{_sysconfdir}/rc.d/init.d/blktapctrl
%{_sysconfdir}/rc.d/init.d/xenstored
@@ -382,6 +389,8 @@ rm -rf %{buildroot}
%dir /usr/lib/%{name}
%dir /usr/lib/%{name}/bin
/usr/lib/%{name}/bin/stubdom-dm
+/usr/lib/%{name}/bin/qemu-dm
+/usr/lib/%{name}/bin/stubdompath.sh
%endif
%dir /usr/lib/%{name}/boot
# HVM loader is always in /usr/lib regardless of multilib
@@ -407,11 +416,12 @@ rm -rf %{buildroot}
%{_bindir}/xenstore-*
%{_bindir}/pygrub
%{_bindir}/xentrace*
+%{_bindir}/remus
# blktap daemon
%{_sbindir}/blktapctrl
-%{_sbindir}/tapdisk
+%{_sbindir}/tapdisk*
# XSM
-%{_sbindir}/flask-loadpolicy
+%{_sbindir}/flask-*
# Disk utils
%{_sbindir}/qcow-create
%{_sbindir}/qcow2raw
@@ -419,9 +429,17 @@ rm -rf %{buildroot}
# Misc stuff
%{_bindir}/xen-detect
%{_sbindir}/fs-backend
+%{_sbindir}/gtrace*
+%{_sbindir}/lock-util
+%{_sbindir}/td-util
+%{_sbindir}/vhd-*
%{_sbindir}/xen-bugtool
+%{_sbindir}/xen-hvmctx
+%{_sbindir}/xen-tmem-list-parse
%{_sbindir}/xenconsoled
+%{_sbindir}/xenlockprof
%{_sbindir}/xenmon.py*
+%{_sbindir}/xenpaging
%{_sbindir}/xentop
%{_sbindir}/xentrace_setmask
%{_sbindir}/xenbaked
@@ -429,6 +447,7 @@ rm -rf %{buildroot}
%{_sbindir}/xenpm
%{_sbindir}/xenpmd
%{_sbindir}/xenperf
+%{_sbindir}/xl
%{_sbindir}/xsview
# Xen logfiles
@@ -456,6 +475,12 @@ rm -rf %{buildroot}
%{_libdir}/*.so
%changelog
+* Tue Jun 7 2010 Michael Young <m.a.young at durham.ac.uk> - 4.0.0-1
+- update to 4.0.0 release
+- rebase xen-initscript.patch and xen-dumpdir.patch patches
+- adjust spec file for files added to or removed from the packages
+- add new build dependencies libuuid-devel and iasl
+
* Tue Jun 1 2010 Michael Young <m.a.young at durham.ac.uk> - 3.4.3-1
- update to 3.4.3 release including
support for latest pv_ops kernels (possibly incomplete)
More information about the scm-commits
mailing list