rpms/xen/FC-4 .cvsignore, 1.6, 1.7 sources, 1.17, 1.18 xen-misc-fixes.patch, 1.16, 1.17 xen.spec, 1.43, 1.44 xen-qemu.patch, 1.2, NONE xen-vmxfixes.patch, 1.2, NONE

Mon Aug 15 18:44:38 UTC 2005

Author: riel

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

Modified Files:
	.cvsignore sources xen-misc-fixes.patch xen.spec 
Removed Files:
	xen-qemu.patch xen-vmxfixes.patch 
Log Message:
upgrade to a known-working newer Xen, now that execshield works again


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7

--- .cvsignore	20 May 2005 19:10:14 -0000	1.6
+++ .cvsignore	15 Aug 2005 18:44:34 -0000	1.7
@@ -1,2 +1 @@
-qemu-ioemu.tar.gz
 xen-unstable-src.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	20 May 2005 19:10:14 -0000	1.17
+++ sources	15 Aug 2005 18:44:34 -0000	1.18
@@ -1,2 +1 @@
-70b068b4585e01e9fbd86d57e44f7e8f  qemu-ioemu.tar.gz
-425a87af78cc9ec01b04095c99bd0c90  xen-unstable-src.tgz
+5c7c731e3a399686cce67680c8b628db  xen-unstable-src.tgz

xen-misc-fixes.patch:
 libxc/xc_core.c        |    8 ++++----
 misc/lomount/lomount.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: xen-misc-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-4/xen-misc-fixes.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xen-misc-fixes.patch	25 Apr 2005 13:52:16 -0000	1.16
+++ xen-misc-fixes.patch	15 Aug 2005 18:44:34 -0000	1.17
@@ -1,12 +1,41 @@
---- xen-unstable/tools/xfrd/xen_domain.c.gcc4	2005-03-31 22:28:53.000000000 -0500
-+++ xen-unstable/tools/xfrd/xen_domain.c	2005-03-31 22:29:04.000000000 -0500
-@@ -178,7 +178,8 @@ static CURL *curlinit(void){
-  */
- int curldebug(CURL *curl, curl_infotype ty, char *buf, size_t buf_n, void *data){
-     // printf("%*s\n", buf_n, buf); /* Does not compile correctly on non 32bit platforms */
--    fwrite(data, buf_n, 1, stdout);
-+    int err;
-+    err = fwrite(data, buf_n, 1, stdout);
-     printf("\n");
-     return 0;
+--- xen-unstable/tools/libxc/xc_core.c.gcc4	2005-07-12 11:59:34.000000000 -0400
++++ xen-unstable/tools/libxc/xc_core.c	2005-07-12 12:00:26.000000000 -0400
+@@ -32,7 +32,7 @@
+ 	unsigned long nr_pages;
+ 	unsigned long *page_array;
+ 	xc_dominfo_t info;
+-	int i, j, vcpu_map_size, dump_fd;
++	int i, j, vcpu_map_size, dump_fd, dummy;
+ 	char *dump_mem, *dump_mem_start = NULL;
+ 	struct xc_core_header header;
+ 	vcpu_guest_context_t     ctxt[MAX_VIRT_CPUS];
+@@ -78,8 +78,8 @@
+ 	    (sizeof(vcpu_guest_context_t) * info.vcpus) + 
+ 	    (nr_pages * sizeof(unsigned long)));
+ 
+-	write(dump_fd, &header, sizeof(struct xc_core_header));
+-	write(dump_fd, &ctxt, sizeof(ctxt[0]) * info.vcpus);
++	dummy = write(dump_fd, &header, sizeof(struct xc_core_header));
++	dummy = write(dump_fd, &ctxt, sizeof(ctxt[0]) * info.vcpus);
+ 
+ 	if ((page_array = malloc(nr_pages * sizeof(unsigned long))) == NULL) {
+ 	    printf("Could not allocate memory\n");
+@@ -89,7 +89,7 @@
+ 	    printf("Could not get the page frame list\n");
+ 	    goto error_out;
+ 	}
+-	write(dump_fd, page_array, nr_pages * sizeof(unsigned long));
++	dummy = write(dump_fd, page_array, nr_pages * sizeof(unsigned long));
+ 	lseek(dump_fd, header.xch_pages_offset, SEEK_SET);
+ 	for (dump_mem = dump_mem_start, i = 0; i < nr_pages; i++) {
+ 		copy_from_domain_page(xc_handle, domid, page_array, i, dump_mem);
+--- xen-unstable/tools/misc/lomount/lomount.c.gcc4	2005-07-27 16:17:42.000000000 -0400
++++ xen-unstable/tools/misc/lomount/lomount.c	2005-07-27 16:18:06.000000000 -0400
+@@ -257,6 +257,6 @@
+ #ifdef DEBUG
+ 	printf("%s\n", buf);
+ #endif
+-	system(buf);
++	valid = system(buf);
+ 	return 0;
  }


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-4/xen.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xen.spec	30 May 2005 14:57:01 -0000	1.43
+++ xen.spec	15 Aug 2005 18:44:34 -0000	1.44
@@ -3,15 +3,13 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 2
-Release: 20050530
+Release: 20050726
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 Source0: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-unstable-src.tgz
 Source1: qemu-ioemu.tar.gz
 Patch0: xen-misc-fixes.patch
-Patch1: xen-vmxfixes.patch
-Patch2: xen-qemu.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel
 BuildRequires: xorg-x11-devel python-devel ghostscript tetex-latex
@@ -39,8 +37,6 @@
 %{__tar} xz --strip-components=1 -f %{SOURCE1}
 %{__chmod} -R u+w tools/ioemu
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} xen tools docs 
@@ -62,21 +58,22 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog README
+%doc COPYING README
 %doc docs/pdf/
 %doc docs/misc/
 %doc tools/ioemu/*.html
-/boot/%{name}-syms
-/boot/%{name}.gz
+/boot/%{name}*.gz
+/boot/%{name}-syms-3.0-devel
 %{_sbindir}/netfix
 %{_sbindir}/xcs
 %{_sbindir}/xcsdump
 %{_sbindir}/xend
-%{_sbindir}/xensv
-%{_sbindir}/xfrd
 %{_sbindir}/xm
 %{_sbindir}/xenperf
+%{_sbindir}/xenstored
 %{_bindir}/device-model
+%{_bindir}/lomount
+%{_bindir}/pygrub
 %{_bindir}/qemu-dm
 %{_bindir}/xenperf
 %{_bindir}/xencons
@@ -90,18 +87,28 @@
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_libdir}/libxc.*
-%{_libdir}/libxutil.*
+%{_libdir}/libxenstore-pic.a
+%{_libdir}/libxenstore.a
+%{_libdir}/%{name}/boot/mem-map.sxp
 %dir %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/*
+%dir %{python_sitearch}/grub
+%{python_sitearch}/grub/*
 %{_mandir}/man?/*.?.gz
 %dir %{_localstatedir}/lib/%{name}
 %{_localstatedir}/lib/%{name}/*
 %{_datadir}/qemu/*
 %{_sysconfdir}/rc.d/init.d/xend
 %{_sysconfdir}/rc.d/init.d/xendomains
-%{_sysconfdir}/%{name}*
+%dir %{_sysconfdir}/%{name}
+%config %{_sysconfdir}/%{name}/*
+/usr/libexec/xen/xc_restore
+/usr/libexec/xen/xc_save
 
 %changelog
+* Mon Aug 15 2005 Rik van Riel <riel at redhat.com> 2-20050726
+- upgrade to a known-working newer Xen, now that execshield works again
+
 * Mon May 30 2005 Rik van Riel <riel at redhat.com> 2-20050530
 - create /var/lib/xen/xen-db/migrate directory so "xm save" works (#158895)
 


--- xen-qemu.patch DELETED ---


--- xen-vmxfixes.patch DELETED ---


