|
|
|
|
@@ -12,11 +12,13 @@
|
|
|
|
|
%define with_libvirtd 0%{!?_without_libvirtd:1}
|
|
|
|
|
%define with_uml 0%{!?_without_uml:1}
|
|
|
|
|
%define with_one 0%{!?_without_one:1}
|
|
|
|
|
%define with_phyp 0%{!?_without_phyp:1}
|
|
|
|
|
%define with_network 0%{!?_without_network:1}
|
|
|
|
|
%define with_storage_fs 0%{!?_without_storage_fs:1}
|
|
|
|
|
%define with_storage_lvm 0%{!?_without_storage_lvm:1}
|
|
|
|
|
%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
|
|
|
|
|
%define with_storage_disk 0%{!?_without_storage_disk:1}
|
|
|
|
|
%define with_storage_mpath 0%{!?_without_storage_mpath:1}
|
|
|
|
|
%define with_numactl 0%{!?_without_numactl:1}
|
|
|
|
|
|
|
|
|
|
# default to off - selectively enabled below
|
|
|
|
|
@@ -24,9 +26,6 @@
|
|
|
|
|
%define with_capng 0%{!?_without_capng:0}
|
|
|
|
|
%define with_netcf 0%{!?_without_netcf:0}
|
|
|
|
|
|
|
|
|
|
# default to off
|
|
|
|
|
%define with_phyp 0%{!?_without_phyp:0}
|
|
|
|
|
|
|
|
|
|
# Xen is available only on i386 x86_64 ia64
|
|
|
|
|
%ifnarch i386 i586 i686 x86_64 ia64
|
|
|
|
|
%define with_xen 0
|
|
|
|
|
@@ -74,18 +73,19 @@
|
|
|
|
|
%define with_one 0
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%define git_snapshot gitfac3f4c
|
|
|
|
|
|
|
|
|
|
Summary: Library providing a simple API virtualization
|
|
|
|
|
Name: libvirt
|
|
|
|
|
Version: 0.7.0
|
|
|
|
|
Release: 0.7.gite195b43%{?dist}%{?extra_release}
|
|
|
|
|
Version: 0.7.1
|
|
|
|
|
Release: 0.2.%{git_snapshot}%{?dist}%{?extra_release}
|
|
|
|
|
License: LGPLv2+
|
|
|
|
|
Group: Development/Libraries
|
|
|
|
|
Source: libvirt-0.7.0-0.6.gite195b43.tar.gz
|
|
|
|
|
Source: http://libvirt.org/sources/libvirt-%{version}-%{git_snapshot}.tar.gz
|
|
|
|
|
|
|
|
|
|
# Temporary hack till PulseAudio autostart problems are sorted
|
|
|
|
|
# out when SELinux enforcing (bz 486112)
|
|
|
|
|
Patch200: libvirt-0.6.4-svirt-sound.patch
|
|
|
|
|
Patch00: libvirt-0.6.4-svirt-sound.patch
|
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
URL: http://libvirt.org/
|
|
|
|
|
@@ -100,8 +100,12 @@ Requires: iptables
|
|
|
|
|
# needed for device enumeration
|
|
|
|
|
Requires: hal
|
|
|
|
|
%if %{with_polkit}
|
|
|
|
|
%if 0%{?fedora} >= 12
|
|
|
|
|
Requires: polkit >= 0.93
|
|
|
|
|
%else
|
|
|
|
|
Requires: PolicyKit >= 0.6
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_storage_fs}
|
|
|
|
|
# For mount/umount in FS driver
|
|
|
|
|
BuildRequires: util-linux
|
|
|
|
|
@@ -109,11 +113,18 @@ BuildRequires: util-linux
|
|
|
|
|
BuildRequires: nfs-utils
|
|
|
|
|
Requires: nfs-utils
|
|
|
|
|
# For glusterfs
|
|
|
|
|
%if 0%{?fedora} >= 11
|
|
|
|
|
Requires: glusterfs-client >= 2.0.1
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
# From QEMU RPMs
|
|
|
|
|
Requires: /usr/bin/qemu-img
|
|
|
|
|
# For image compression
|
|
|
|
|
Requires: gzip
|
|
|
|
|
Requires: bzip2
|
|
|
|
|
Requires: lzop
|
|
|
|
|
Requires: xz
|
|
|
|
|
%else
|
|
|
|
|
%if %{with_xen}
|
|
|
|
|
# From Xen RPMs
|
|
|
|
|
@@ -132,6 +143,10 @@ Requires: iscsi-initiator-utils
|
|
|
|
|
# For disk driver
|
|
|
|
|
Requires: parted
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_storage_mpath}
|
|
|
|
|
# For multipath support
|
|
|
|
|
Requires: device-mapper
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_xen}
|
|
|
|
|
BuildRequires: xen-devel
|
|
|
|
|
%endif
|
|
|
|
|
@@ -155,8 +170,13 @@ BuildRequires: bridge-utils
|
|
|
|
|
BuildRequires: cyrus-sasl-devel
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_polkit}
|
|
|
|
|
%if 0%{?fedora} >= 12
|
|
|
|
|
# Only need the binary, not -devel
|
|
|
|
|
BuildRequires: polkit >= 0.93
|
|
|
|
|
%else
|
|
|
|
|
BuildRequires: PolicyKit-devel >= 0.6
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_storage_fs}
|
|
|
|
|
# For mount/umount in FS driver
|
|
|
|
|
BuildRequires: util-linux
|
|
|
|
|
@@ -182,6 +202,10 @@ BuildRequires: iscsi-initiator-utils
|
|
|
|
|
# For disk driver
|
|
|
|
|
BuildRequires: parted-devel
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_storage_mpath}
|
|
|
|
|
# For Multipath support
|
|
|
|
|
BuildRequires: device-mapper-devel
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_numactl}
|
|
|
|
|
# For QEMU/LXC numa info
|
|
|
|
|
BuildRequires: numactl-devel
|
|
|
|
|
@@ -190,7 +214,7 @@ BuildRequires: numactl-devel
|
|
|
|
|
BuildRequires: libcap-ng-devel >= 0.5.0
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_phyp}
|
|
|
|
|
BuildRequires: libssh-devel >= 0.3.1
|
|
|
|
|
BuildRequires: libssh2-devel
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with_netcf}
|
|
|
|
|
BuildRequires: netcf-devel
|
|
|
|
|
@@ -252,7 +276,7 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q
|
|
|
|
|
|
|
|
|
|
%patch200 -p0
|
|
|
|
|
%patch00 -p1
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%if ! %{with_xen}
|
|
|
|
|
@@ -331,6 +355,10 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
%define _without_storage_disk --without-storage-disk
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_storage_mpath}
|
|
|
|
|
%define _without_storage_mpath --without-storage-mpath
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if ! %{with_numactl}
|
|
|
|
|
%define _without_numactl --without-numactl
|
|
|
|
|
%endif
|
|
|
|
|
@@ -362,6 +390,7 @@ of recent versions of Linux (and other OSes).
|
|
|
|
|
%{?_without_storage_lvm} \
|
|
|
|
|
%{?_without_storage_iscsi} \
|
|
|
|
|
%{?_without_storage_disk} \
|
|
|
|
|
%{?_without_storage_mpath} \
|
|
|
|
|
%{?_without_numactl} \
|
|
|
|
|
%{?_without_capng} \
|
|
|
|
|
%{?_without_netcf} \
|
|
|
|
|
@@ -450,6 +479,9 @@ fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
/sbin/chkconfig --add libvirtd
|
|
|
|
|
if [ "$1" -ge "1" ]; then
|
|
|
|
|
/sbin/service libvirtd condrestart > /dev/null 2>&1
|
|
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%preun
|
|
|
|
|
@@ -496,12 +528,12 @@ fi
|
|
|
|
|
%dir %{_localstatedir}/run/libvirt/
|
|
|
|
|
|
|
|
|
|
%dir %{_localstatedir}/lib/libvirt/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
|
|
|
|
|
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
|
|
|
|
|
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
|
|
|
|
|
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/run/libvirt/qemu/
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/
|
|
|
|
|
%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
|
|
|
|
%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
|
|
|
|
%endif
|
|
|
|
|
@@ -532,8 +564,12 @@ fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with_polkit}
|
|
|
|
|
%if 0%{?fedora} >= 12
|
|
|
|
|
%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
|
|
|
|
|
%else
|
|
|
|
|
%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
|
|
|
|
|
%if %{with_qemu}
|
|
|
|
|
@@ -575,6 +611,8 @@ fi
|
|
|
|
|
%{_datadir}/libvirt/schemas/nodedev.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/capability.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/interface.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/secret.rng
|
|
|
|
|
%{_datadir}/libvirt/schemas/storageencryption.rng
|
|
|
|
|
|
|
|
|
|
%if %{with_sasl}
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
|
|
|
|
@@ -612,6 +650,56 @@ fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Mon Sep 14 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-0.2.gitfac3f4c
|
|
|
|
|
- Update to newer snapshot of 0.7.1
|
|
|
|
|
- Stop libvirt using untrusted 'info vcpus' PID data (#520864)
|
|
|
|
|
- Support relabelling of USB and PCI devices
|
|
|
|
|
- Enable multipath storage support
|
|
|
|
|
- Restart libvirtd upon RPM upgrade
|
|
|
|
|
|
|
|
|
|
* Sun Sep 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-0.1.gitg3ef2e05
|
|
|
|
|
- Update to pre-release git snapshot of 0.7.1
|
|
|
|
|
- Drop upstreamed patches
|
|
|
|
|
|
|
|
|
|
* Wed Aug 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-6
|
|
|
|
|
- Fix migration completion with newer versions of qemu (#516187)
|
|
|
|
|
|
|
|
|
|
* Wed Aug 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-5
|
|
|
|
|
- Add PCI host device hotplug support
|
|
|
|
|
- Allow PCI bus reset to reset other devices (#499678)
|
|
|
|
|
- Fix stupid PCI reset error message (bug #499678)
|
|
|
|
|
- Allow PM reset on multi-function PCI devices (bug #515689)
|
|
|
|
|
- Re-attach PCI host devices after guest shuts down (bug #499561)
|
|
|
|
|
- Fix list corruption after disk hot-unplug
|
|
|
|
|
- Fix minor 'virsh nodedev-list --tree' annoyance
|
|
|
|
|
|
|
|
|
|
* Thu Aug 13 2009 Daniel P. Berrange <berrange@redhat.com> - 0.7.0-4
|
|
|
|
|
- Rewrite policykit support (rhbz #499970)
|
|
|
|
|
- Log and ignore NUMA topology problems (rhbz #506590)
|
|
|
|
|
|
|
|
|
|
* Mon Aug 10 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-3
|
|
|
|
|
- Don't fail to start network if ipv6 modules is not loaded (#516497)
|
|
|
|
|
|
|
|
|
|
* Thu Aug 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-2
|
|
|
|
|
- Make sure qemu can access kernel/initrd (bug #516034)
|
|
|
|
|
- Set perms on /var/lib/libvirt/boot to 0711 (bug #516034)
|
|
|
|
|
|
|
|
|
|
* Wed Aug 5 2009 Daniel Veillard <veillard@redhat.com> - 0.7.0-1
|
|
|
|
|
- Upstream release of 0.7.0
|
|
|
|
|
- ESX, VBox3, Power Hypervisor drivers
|
|
|
|
|
- new net filesystem glusterfs
|
|
|
|
|
- Storage cloning for LVM and Disk backends
|
|
|
|
|
- interface implementation based on netcf
|
|
|
|
|
- Support cgroups in QEMU driver
|
|
|
|
|
- QEmu hotplug NIC support
|
|
|
|
|
- a lot of fixes
|
|
|
|
|
|
|
|
|
|
* Fri Jul 31 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.9.gite195b43
|
|
|
|
|
- Set perms on /var/lib/libvirt/images to 0711
|
|
|
|
|
|
|
|
|
|
* Thu Jul 30 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.8.gite195b43
|
|
|
|
|
- Add patch from upstream to fix qemu pidfile perms problem
|
|
|
|
|
|
|
|
|
|
* Thu Jul 30 2009 Daniel P. Berrange <berrange@redhat.com> - 0.7.0-0.7.gite195b43
|
|
|
|
|
- Create qemu/kvm user & group to fix upgrades
|
|
|
|
|
|
|
|
|
|
|