External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvirt.spec.in: remove nodedev conditional

Browse Source 
Both RHEL and Fedora build with the nodedev driver enabled
at all times.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-05-04 16:41:16 +01:00
parent a659559bb0
commit c8bcff8143
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libvirt.spec.in
View File

@ -204,8 +204,6 @@
%define with_cgconfig 0%{!?_without_cgconfig:1} %define with_cgconfig 0%{!?_without_cgconfig:1}
%endif %endif
%define with_nodedev 1
# Force QEMU to run as non-root # Force QEMU to run as non-root
%define qemu_user qemu %define qemu_user qemu
%define qemu_group qemu %define qemu_group qemu
@ -554,24 +552,21 @@ iptables and ip6tables capabilities
%endif %endif
%if %{with_nodedev}
%package daemon-driver-nodedev %package daemon-driver-nodedev
Summary: Nodedev driver plugin for the libvirtd daemon Summary: Nodedev driver plugin for the libvirtd daemon
Group: Development/Libraries Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
# needed for device enumeration # needed for device enumeration
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
Requires: systemd >= 185 Requires: systemd >= 185
%else %else
Requires: udev >= 145 Requires: udev >= 145
%endif
%endif %endif
%description daemon-driver-nodedev %description daemon-driver-nodedev
The nodedev driver plugin for the libvirtd daemon, providing The nodedev driver plugin for the libvirtd daemon, providing
an implementation of the node device APIs using the udev an implementation of the node device APIs using the udev
capabilities. capabilities.
%endif
%package daemon-driver-interface %package daemon-driver-interface
@ -1635,11 +1630,9 @@ exit 0
%attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper
%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
%if %{with_nodedev}
%files daemon-driver-nodedev %files daemon-driver-nodedev
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
%endif
%if %{with_nwfilter} %if %{with_nwfilter}
%files daemon-driver-nwfilter %files daemon-driver-nwfilter