[libvirt/f17] spec: Add missed dependancy for numad

Daniel P. Berrange berrange at fedoraproject.org
Wed Apr 4 11:21:49 UTC 2012


commit 5636327a0d3bf84a7c743a991cdeafe1e855052a
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Wed Apr 4 11:38:11 2012 +0100

    spec: Add missed dependancy for numad

 libvirt.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 4592062..632f4fb 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -84,6 +84,7 @@
 %define with_cgconfig      0%{!?_without_cgconfig:0}
 %define with_sanlock       0%{!?_without_sanlock:0}
 %define with_systemd       0%{!?_without_systemd:0}
+%define with_numad         0%{!?_without_numad:0}
 
 # Non-server/HV driver defaults which are always enabled
 %define with_python        0%{!?_without_python:1}
@@ -205,11 +206,19 @@
 %define with_storage_disk 0
 %endif
 
-# Enable libpcap library
 %if %{with_qemu}
 %define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}}
+# Enable libpcap library
 %define with_libpcap  0%{!?_without_libpcap:%{server_drivers}}
 %define with_macvtap  0%{!?_without_macvtap:%{server_drivers}}
+
+# numad is used to manage the CPU placement dynamically,
+# it's not available on s390[x] and ARM.
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
+%ifnarch s390 s390x %{arm}
+%define with_numad    0%{!?_without_numad:%{server_drivers}}
+%endif
+%endif
 %endif
 
 %if %{with_macvtap}
@@ -359,6 +368,9 @@ Requires(post): systemd-sysv
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 %endif
+%if %{with_numad}
+Requires: numad
+%endif
 
 # All build-time requirements
 %if 0%{?enable_autotools}
@@ -518,6 +530,10 @@ BuildRequires: gawk
 # For storage wiping with different algorithms
 BuildRequires: scrub
 
+%if %{with_numad}
+BuildRequires: numad
+%endif
+
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -693,6 +709,10 @@ of recent versions of Linux (and other OSes).
 %define _without_numactl --without-numactl
 %endif
 
+%if ! %{with_numad}
+%define _without_numad --without-numad
+%endif
+
 %if ! %{with_capng}
 %define _without_capng --without-capng
 %endif
@@ -778,6 +798,7 @@ autoreconf -if
            %{?_without_storage_disk} \
            %{?_without_storage_mpath} \
            %{?_without_numactl} \
+           %{?_without_numad} \
            %{?_without_capng} \
            %{?_without_netcf} \
            %{?_without_selinux} \


More information about the scm-commits mailing list