[libvirt] [PATCH] building: fix deps error when some drivers are not built

Wen Congyang wency at cn.fujitsu.com
Mon Jul 23 09:58:28 UTC 2012


libvirt-daemon-driver-XXX should be depent on only when with_driver_modules
is 1.
libvirt-daemon-driver-libxl should be depent on only when with_libxl is 1.
libvirt-daemon-driver-lxc should be depent on only when with_lxc is 1.
libvirt-daemon-driver-qemu should be depent on only when with_qemu is 1.
libvirt-daemon-driver-uml should be depent on only when with_uml is 1.
libvirt-daemon-driver-xen should be depent on only when with_xen is 1.

---
 libvirt.spec.in |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 140a182..cfcfc1c 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -326,11 +326,22 @@ Requires: libvirt-daemon-config-network = %{version}-%{release}
 %if %{with_nwfilter}
 Requires: libvirt-daemon-config-nwfilter = %{version}-%{release}
 %endif
+%if %{with_driver_modules}
+%if %{with_libxl}
 Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
+%endif
+%if %{with_lxc}
 Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
+%endif
+%if %{with_qemu}
 Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
+%endif
+%if %{with_uml}
 Requires: libvirt-daemon-driver-uml = %{version}-%{release}
+%endif
+%if %{with_xen}
 Requires: libvirt-daemon-driver-xen = %{version}-%{release}
+%endif
 
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{version}-%{release}
@@ -339,6 +350,7 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release}
 Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
 %endif
+%endif
 Requires: libvirt-client = %{version}-%{release}
 
 # All build-time requirements. Run-time requirements are
@@ -750,7 +762,9 @@ Summary: Qemu driver plugin for the libvirtd daemon
 Group: Development/Libraries
 Requires: libvirt-daemon = %{version}-%{release}
 # There really is a hard cross-driver dependency here
+%if %{with_driver_modules}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
+%endif
 
 %description daemon-driver-qemu
 The qemu driver plugin for the libvirtd daemon, providing
@@ -765,7 +779,9 @@ Summary: LXC driver plugin for the libvirtd daemon
 Group: Development/Libraries
 Requires: libvirt-daemon = %{version}-%{release}
 # There really is a hard cross-driver dependency here
+%if %{with_driver_modules}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
+%endif
 
 %description daemon-driver-lxc
 The LXC driver plugin for the libvirtd daemon, providing
-- 
1.7.1




More information about the libvir-list mailing list