rpms/xen/devel xen-initscript.patch, NONE, 1.1 sources, 1.18, 1.19 xen-misc-fixes.patch, 1.17, 1.18 xen.spec, 1.47, 1.48
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 9 03:27:19 UTC 2005
Author: riel
Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8945
Modified Files:
sources xen-misc-fixes.patch xen.spec
Added Files:
xen-initscript.patch
Log Message:
copy latest FC4 bits into FC5
xen-initscript.patch:
xend | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE xen-initscript.patch ---
--- xen-unstable/tools/examples/init.d/xend.path 2005-09-08 10:41:54.000000000 -0400
+++ xen-unstable/tools/examples/init.d/xend 2005-09-08 10:43:03.000000000 -0400
@@ -16,28 +16,28 @@
{
i=1
rets=10
- xend status
+ /usr/sbin/xend status
while [ $? -ne 0 -a $i -lt $rets ]; do
sleep 1
echo -n .
i=$(($i + 1))
- xend status
+ /usr/sbin/xend status
done
}
case "$1" in
start)
- xend start
+ /usr/sbin/xend start
await_daemons_up
;;
stop)
- xend stop
+ /usr/sbin/xend stop
;;
status)
- xend status
+ /usr/sbin/xend status
;;
restart|reload|force-reload)
- xend restart
+ /usr/sbin/xend restart
await_daemons_up
;;
*)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 23 Aug 2005 19:07:30 -0000 1.18
+++ sources 9 Sep 2005 03:27:15 -0000 1.19
@@ -1 +1 @@
-c0eace44302ca04a8e6e8bb82b8e3af1 xen-unstable-src.tgz
+535267435f8f51f512540ca16b26ea0e xen-unstable-src.tgz
xen-misc-fixes.patch:
console/daemon/utils.c | 8 ++++-
libxc/xc_core.c | 8 ++---
misc/lomount/lomount.c | 2 -
xenstore/xenstored_core.c | 66 +++++++++++++++++++++++++---------------------
4 files changed, 48 insertions(+), 36 deletions(-)
Index: xen-misc-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-misc-fixes.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xen-misc-fixes.patch 23 Aug 2005 19:07:30 -0000 1.17
+++ xen-misc-fixes.patch 9 Sep 2005 03:27:15 -0000 1.18
@@ -39,3 +39,204 @@
+ valid = system(buf);
return 0;
}
+--- xen-unstable/tools/xenstore/xenstored_core.c.gcc4 2005-09-07 11:04:59.000000000 -0400
++++ xen-unstable/tools/xenstore/xenstored_core.c 2005-09-07 11:07:55.000000000 -0400
+@@ -161,83 +161,89 @@
+ {
+ char string[64];
+ unsigned int i;
++ int dummy;
+
+ if (tracefd < 0)
+ return;
+
+- write(tracefd, prefix, strlen(prefix));
++ dummy = write(tracefd, prefix, strlen(prefix));
+ sprintf(string, " %p ", conn);
+- write(tracefd, string, strlen(string));
+- write(tracefd, sockmsg_string(data->hdr.msg.type),
++ dummy = write(tracefd, string, strlen(string));
++ dummy = write(tracefd, sockmsg_string(data->hdr.msg.type),
+ strlen(sockmsg_string(data->hdr.msg.type)));
+- write(tracefd, " (", 2);
++ dummy = write(tracefd, " (", 2);
+ for (i = 0; i < data->hdr.msg.len; i++) {
+ if (data->buffer[i] == '\0')
+- write(tracefd, " ", 1);
++ dummy = write(tracefd, " ", 1);
+ else
+- write(tracefd, data->buffer + i, 1);
++ dummy = write(tracefd, data->buffer + i, 1);
+ }
+- write(tracefd, ")\n", 2);
++ dummy = write(tracefd, ")\n", 2);
+ }
+
+ void trace_create(const void *data, const char *type)
+ {
+ char string[64];
++ int dummy;
+ if (tracefd < 0)
+ return;
+
+- write(tracefd, "CREATE ", strlen("CREATE "));
+- write(tracefd, type, strlen(type));
++ dummy = write(tracefd, "CREATE ", strlen("CREATE "));
++ dummy = write(tracefd, type, strlen(type));
+ sprintf(string, " %p\n", data);
+- write(tracefd, string, strlen(string));
++ dummy = write(tracefd, string, strlen(string));
+ }
+
+ void trace_destroy(const void *data, const char *type)
+ {
+ char string[64];
++ int dummy;
+ if (tracefd < 0)
+ return;
+
+- write(tracefd, "DESTROY ", strlen("DESTROY "));
+- write(tracefd, type, strlen(type));
++ dummy = write(tracefd, "DESTROY ", strlen("DESTROY "));
++ dummy = write(tracefd, type, strlen(type));
+ sprintf(string, " %p\n", data);
+- write(tracefd, string, strlen(string));
++ dummy = write(tracefd, string, strlen(string));
+ }
+
+ void trace_watch_timeout(const struct connection *conn, const char *node, const char *token)
+ {
+ char string[64];
++ int dummy;
+ if (tracefd < 0)
+ return;
+- write(tracefd, "WATCH_TIMEOUT ", strlen("WATCH_TIMEOUT "));
++ dummy = write(tracefd, "WATCH_TIMEOUT ", strlen("WATCH_TIMEOUT "));
+ sprintf(string, " %p ", conn);
+- write(tracefd, string, strlen(string));
+- write(tracefd, " (", 2);
+- write(tracefd, node, strlen(node));
+- write(tracefd, " ", 1);
+- write(tracefd, token, strlen(token));
+- write(tracefd, ")\n", 2);
++ dummy = write(tracefd, string, strlen(string));
++ dummy = write(tracefd, " (", 2);
++ dummy = write(tracefd, node, strlen(node));
++ dummy = write(tracefd, " ", 1);
++ dummy = write(tracefd, token, strlen(token));
++ dummy = write(tracefd, ")\n", 2);
+ }
+
+ static void trace_blocked(const struct connection *conn,
+ const struct buffered_data *data)
+ {
+ char string[64];
++ int dummy;
+
+ if (tracefd < 0)
+ return;
+
+- write(tracefd, "BLOCKED", strlen("BLOCKED"));
++ dummy = write(tracefd, "BLOCKED", strlen("BLOCKED"));
+ sprintf(string, " %p (", conn);
+- write(tracefd, string, strlen(string));
+- write(tracefd, sockmsg_string(data->hdr.msg.type),
++ dummy = write(tracefd, string, strlen(string));
++ dummy = write(tracefd, sockmsg_string(data->hdr.msg.type),
+ strlen(sockmsg_string(data->hdr.msg.type)));
+- write(tracefd, ")\n", 2);
++ dummy = write(tracefd, ")\n", 2);
+ }
+
+ void trace(const char *fmt, ...)
+ {
+ va_list arglist;
++ int dummy;
+ char *str;
+
+ if (tracefd < 0)
+@@ -246,7 +252,7 @@
+ va_start(arglist, fmt);
+ str = talloc_vasprintf(NULL, fmt, arglist);
+ va_end(arglist);
+- write(tracefd, str, strlen(str));
++ dummy = write(tracefd, str, strlen(str));
+ talloc_free(str);
+ }
+
+@@ -1616,6 +1622,7 @@
+ static void write_pidfile(const char *pidfile)
+ {
+ char buf[100];
++ int dummy;
+ int len;
+ int fd;
+
+@@ -1628,7 +1635,7 @@
+ exit(0);
+
+ len = sprintf(buf, "%d\n", getpid());
+- write(fd, buf, len);
++ dummy = write(fd, buf, len);
+ }
+
+ /* Stevens. */
+@@ -1642,6 +1642,7 @@
+ static void daemonize(void)
+ {
+ pid_t pid;
++ int dummy;
+
+ /* Separate from our parent via fork, so init inherits us. */
+ if ((pid = fork()) < 0)
+@@ -1652,7 +1653,7 @@
+ /* Session leader so ^C doesn't whack us. */
+ setsid();
+ /* Move off any mount points we might be in. */
+- chdir("/");
++ dummy = chdir("/");
+ /* Discard our parent's old-fashioned umask prejudices. */
+ umask(0);
+ }
+@@ -1780,7 +1787,7 @@
+
+ int main(int argc, char *argv[])
+ {
+- int opt, *sock, *ro_sock, event_fd, max;
++ int opt, *sock, *ro_sock, event_fd, max, dummy;
+ struct sockaddr_un addr;
+ fd_set inset, outset;
+ bool dofork = true;
+@@ -1804,7 +1811,7 @@
+ if (tracefd < 0)
+ barf_perror("Could not open tracefile %s",
+ optarg);
+- write(tracefd, "\n***\n", strlen("\n***\n"));
++ dummy = write(tracefd, "\n***\n", strlen("\n***\n"));
+ break;
+ case 'V':
+ verbose = true;
+--- xen-unstable/tools/console/daemon/utils.c.gcc4 2005-09-07 11:14:24.000000000 -0400
++++ xen-unstable/tools/console/daemon/utils.c 2005-09-07 11:16:21.000000000 -0400
+@@ -105,7 +105,9 @@
+ close(fd);
+
+ umask(027);
+- chdir("/");
++ if (chdir("/") < 0) {
++ exit(1);
++ }
+
+ fd = open(pidfile, O_RDWR | O_CREAT);
+ if (fd == -1) {
+@@ -117,7 +119,9 @@
+ }
+
+ len = sprintf(buf, "%d\n", getpid());
+- write(fd, buf, len);
++ if (write(fd, buf, len) < 0) {
++ exit(1);
++ }
+
+ signal(SIGCHLD, child_exit);
+ signal(SIGTSTP, SIG_IGN);
Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xen.spec 23 Aug 2005 19:43:27 -0000 1.47
+++ xen.spec 9 Sep 2005 03:27:15 -0000 1.48
@@ -2,15 +2,16 @@
Summary: Xen is a virtual machine monitor
Name: xen
-Version: 2
-Release: 20050823.2
+Version: 3.0
+Release: 0.20050908.fc5
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
Patch0: xen-misc-fixes.patch
+Patch1: xen-initscript.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel
+BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
BuildRequires: xorg-x11-devel python-devel ghostscript tetex-latex
Requires: bridge-utils python-twisted
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -34,11 +35,10 @@
%prep
%setup -q -n xen-unstable
%patch0 -p1
+%patch1 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
-XENFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//'`
-CFLAGS="$XENFLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} xen
+CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} xen tools docs
%install
rm -rf %{buildroot}
@@ -46,6 +46,8 @@
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/domain
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/vnet
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/migrate
+mkdir -p %{buildroot}%{_localstatedir}/lib/xenstored
+mkdir -p %{buildroot}%{_localstatedir}/run/xenstored
rm -rf %{buildroot}%{_datadir}/doc/qemu
### fixing start-script dir
@@ -62,49 +64,35 @@
%doc docs/misc/
/boot/%{name}*.gz
/boot/%{name}-syms-3.0-devel
-%{_sbindir}/netfix
-%{_sbindir}/xcs
-%{_sbindir}/xcsdump
-%{_sbindir}/xenconsoled
-%{_sbindir}/xend
-%{_sbindir}/xm
-%{_sbindir}/xenperf
-%{_sbindir}/xenstored
-%{_sbindir}/xentop
-%{_bindir}/lomount
-%{_bindir}/xenperf
-%{_bindir}/xencons
-%{_bindir}/xentrace
-%{_bindir}/xentrace_format
-%{_bindir}/cpuperf-perfcntr
-%{_bindir}/cpuperf-xen
-%{_bindir}/xc_shadow
+%{_sbindir}/*
+%{_bindir}/*
%{_includedir}/*.h
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
-%{_libdir}/libxc.*
-%{_libdir}/%{name}/boot/mem-map.sxp
-%{_libdir}/%{name}/bin/*
-%{_libdir}/libxenstore.so
-%dir %{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/*
+%{_libdir}/*
%{_mandir}/man?/*.?.gz
+%dir %{_datadir}/%{name}/qemu
%{_datadir}/%{name}/qemu/keymaps/*
%dir %{_localstatedir}/lib/%{name}
%{_localstatedir}/lib/%{name}/*
-%{_sysconfdir}/rc.d/init.d/xend
-%{_sysconfdir}/rc.d/init.d/xendomains
+%{_sysconfdir}/rc.d/init.d/*
+%{_sysconfdir}/hotplug/xen-backend.agent
%dir %{_sysconfdir}/%{name}
-%config %{_sysconfdir}/%{name}/*
-/usr/libexec/xen/xc_restore
-/usr/libexec/xen/xc_save
-/usr/libexec/xen/xenconsole
+%config(noreplace) %{_sysconfdir}/%{name}/*
+/usr/libexec/xen/*
%changelog
+* Thu Sep 8 2005 Rik van Riel <riel at redhat.com> 3.0-0.20050908
+- explicitly call /usr/sbin/xend from initscript (#167407)
+- add xenstored directories to spec file (#167496, #167121)
+- misc gcc4 fixes
+- spec file cleanups (#161191)
+- upgrade to today's Xen snapshot
+- change the version to 3.0-0.<date> (real 3.0 release will be 3.0-1)
+
* Mon Aug 23 2005 Rik van Riel <riel at redhat.com> 2-20050823
- upgrade to today's Xen snapshot
-- disable -fstack-protector for Xen hypervisor
* 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
More information about the fedora-cvs-commits
mailing list