Changes - j0ke.net Open Build Service

Changes of Revision 9

[-] [+]	Changed	libvirt.changes
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Feb 18 19:12:17 UTC 2012 - cs@linux-administrator.com + +- Update to libvirt 0.9.10 + - reworked some patches + +------------------------------------------------------------------- Wed Sep 28 06:57:49 UTC 2011 - cs@linux-administrator.com - Update to libvirt 0.9.6
[-] [+]	Changed	libvirt.spec ^
@@ -48,6 +48,7 @@ %define with_phyp 0%{!?_without_phyp:0} %define with_esx 0%{!?_without_esx:1} %define with_vmware 0%{!?_without_vmware:1} +%define with_hyperv 0%{!?_without_hyperv:1} # Then the secondary host drivers %define with_network 0%{!?_without_network:%{server_drivers}} @@ -105,6 +106,7 @@ %define with_uml 0 %define with_esx 1 %define with_vmware 1 +%define with_hyperv 1 %define with_xenapi 1 %endif @@ -269,7 +271,7 @@ License: LGPLv2.1+ Group: Development/Libraries/C and C++ AutoReqProv: yes -Version: 0.9.6 +Version: 0.9.10 Release: 1 Summary: A C toolkit to interract with the virtualization capabilities of Linux @@ -337,12 +339,11 @@ # Upstream patches # Need to go upstream Patch100: xen-name-for-devid.patch -Patch101: clone-0.9.4.patch +Patch101: clone-0.9.10.patch Patch102: xen-pv-cdrom.patch -Patch103: xend-disk-order.patch # Our patches Patch200: libvirtd-defaults-0.9.4.patch -Patch201: use-init-script-redhat-0.9.4.patch +Patch201: use-init-script-redhat-0.9.10.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -454,7 +455,6 @@ %patch100 -p1 %patch101 %patch102 -p1 -%patch103 -p1 %patch200 -p1 %patch201 -p1 @@ -489,6 +489,9 @@ %if ! %{with_vmware} %define _without_vmware --without-vmware %endif +%if f! %{with_hyperv} +%define _without_hyperv --without-hyperv +%endif %if ! %{with_libxl} %define _without_libxl --without-libxl %endif @@ -566,6 +569,7 @@ %{?_without_phyp} \ %{?_without_esx} \ %{?_without_vmware} \ + %{?_without_hyperv} \ %{?_without_libxl} \ %{?_without_libvirtd} \ %{?_without_storage_fs} \
[-] [+]	Changed	clone-0.9.10.patch ^
@@ -1,7 +1,7 @@ ---- src/lxc/lxc_container.c.orig 2011-07-25 07:43:18.000000000 +0200 -+++ src/lxc/lxc_container.c 2011-08-08 21:00:36.682640642 +0200 -@@ -991,6 +991,9 @@ - handshakefd}; +--- src/lxc/lxc_container.c.orig 2012-02-13 08:06:23.000000000 +0100 ++++ src/lxc/lxc_container.c 2012-02-18 19:58:47.654818788 +0100 +@@ -1439,6 +1439,9 @@ + ttyPaths, nttyPaths, handshakefd}; /* allocate a stack for the container / +#ifdef __ia64__ @@ -10,7 +10,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -1009,7 +1012,11 @@ +@@ -1457,7 +1460,11 @@ cflags \|= CLONE_NEWNET; } @@ -22,15 +22,15 @@ VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -1036,6 +1043,7 @@ +@@ -1483,6 +1490,7 @@ + int cpid; char childStack; char stack; - int childStatus; + int stacksize = getpagesize() 4; if (features & LXC_CONTAINER_FEATURE_USER) flags \|= CLONE_NEWUSER; -@@ -1043,14 +1051,21 @@ +@@ -1490,14 +1498,21 @@ if (features & LXC_CONTAINER_FEATURE_NET) flags \|= CLONE_NEWNET; @@ -53,4 +53,4 @@ +#endif VIR_FREE(stack); if (cpid < 0) { - char ebuf[1024]; + char ebuf[1024] ATTRIBUTE_UNUSED;
[-] [+]	Changed	use-init-script-redhat-0.9.10.patch ^
@@ -1,31 +1,3 @@ -Index: libvirt-0.9.2/tools/Makefile.am -=================================================================== ---- libvirt-0.9.2.orig/tools/Makefile.am -+++ libvirt-0.9.2/tools/Makefile.am -@@ -131,16 +131,17 @@ uninstall-local: uninstall-init - - if LIBVIRT_INIT_SCRIPT_RED_HAT - install-init: libvirt-guests.init -- mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d -+ mkdir -p $(DESTDIR)$(sysconfdir)/init.d - $(INSTALL_SCRIPT) libvirt-guests.init \ -- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests -- mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig -+ $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests -+ mkdir -p $(DESTDIR)$(localstatedir)/adm/fillup-templates - $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -+ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests - - uninstall-init: -- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -+ rm -f $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests \ -+ $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests \ -+ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests - - BUILT_SOURCES += libvirt-guests.init - Index: libvirt-0.9.2/tools/libvirt-guests.init.sh =================================================================== --- libvirt-0.9.2.orig/tools/libvirt-guests.init.sh @@ -172,30 +144,6 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-0.9.2/daemon/Makefile.am -=================================================================== ---- libvirt-0.9.2.orig/daemon/Makefile.am -+++ libvirt-0.9.2/daemon/Makefile.am -@@ -302,16 +302,12 @@ install-logrotate: $(LOGROTATE_CONFS) - - if LIBVIRT_INIT_SCRIPT_RED_HAT - install-init: libvirtd.init -- mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d -- $(INSTALL_SCRIPT) libvirtd.init \ -- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd -- mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig -+ mkdir -p $(DESTDIR)$(localstatedir)/adm/fillup-templates - $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd -+ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd - - uninstall-init: -- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd -+ rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd - - BUILT_SOURCES += libvirtd.init - --- libvirt-0.9.4/tools/libvirt-guests.sysconf.orig 2011-07-22 06:10:04.000000000 +0200 +++ libvirt-0.9.4/tools/libvirt-guests.sysconf 2011-08-08 21:04:42.529743039 +0200 @@ -1,18 +1,28 @@ @@ -245,3 +193,52 @@ # If non-zero, try to bypass the file system cache when saving and # restoring guests, even though this may give slower operation for +--- libvirt-0.9.10/tools/Makefile.am.orig 2012-02-06 03:50:50.000000000 +0100 ++++ libvirt-0.9.10/tools/Makefile.am 2012-02-18 20:04:09.061686815 +0100 +@@ -182,24 +182,24 @@ + uninstall-local: uninstall-init uninstall-systemd + + install-sysconfig: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig ++ $(MKDIR_P) $(DESTDIR)$(localstatedir)/adm/fillup-templates + $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ +- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests ++ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests + + uninstall-sysconfig: +- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests +- rmdir $(DESTDIR)$(sysconfdir)/sysconfig \|\|: ++ rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests ++ rmdir $(DESTDIR)$(localstatedir)/adm/fillup-templates \|\|: + + EXTRA_DIST += libvirt-guests.init.sh + + install-initscript: libvirt-guests.init +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d ++ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/init.d + $(INSTALL_SCRIPT) libvirt-guests.init \ +- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests ++ $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests + + uninstall-initscript: +- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests +- rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d \|\|: ++ rm -f $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests ++ rmdir $(DESTDIR)$(sysconfdir)/init.d \|\|: + + + if LIBVIRT_INIT_SCRIPT_RED_HAT +--- libvirt-0.9.10/daemon/Makefile.am.orig 2012-02-06 03:50:50.000000000 +0100 ++++ libvirt-0.9.10/daemon/Makefile.am 2012-02-18 20:05:30.885500424 +0100 +@@ -249,9 +249,9 @@ + rmdir $(DESTDIR)$(sysconfdir)/logrotate.d \|\| : + + install-sysconfig: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig ++ $(MKDIR_P) $(DESTDIR)$(localstatedir)/adm/fillup-templates + $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ +- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd ++ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd + uninstall-sysconfig: + rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd + rmdir $(DESTDIR)$(sysconfdir)/sysconfig \|\| :
	Changed	libvirt-0.9.10.tar.bz2 ^