diff --git a/tuned.spec b/tuned.spec index b72fbd0..2d4adf2 100644 --- a/tuned.spec +++ b/tuned.spec @@ -3,7 +3,6 @@ %bcond_with snapshot %if 0%{?fedora} -%bcond_without tscdeadline_latency %if 0%{?fedora} > 27 %bcond_without python3 %else @@ -15,7 +14,6 @@ %else %bcond_without python3 %endif -%bcond_with tscdeadline_latency %endif %if %{with python3} @@ -51,15 +49,9 @@ Version: 2.9.0 Release: 1%{?prerel1}%{?with_snapshot:.%{git_suffix}}%{?dist} License: GPLv2+ Source0: https://github.com/redhat-performance/%{name}/archive/v%{version}%{?prerel2}.tar.gz#/%{name}-%{version}%{?prerel1}.tar.gz -%if %{with tscdeadline_latency} -Source1: https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git/snapshot/kvm-unit-tests-%{kvm_tests_snap}.tar.gz -%endif URL: http://www.tuned-project.org/ BuildArch: noarch BuildRequires: systemd, desktop-file-utils -%if %{with tscdeadline_latency} -BuildRequires: gcc-x86_64-linux-gnu -%endif Requires(post): systemd, virt-what Requires(preun): systemd Requires(postun): systemd @@ -178,26 +170,13 @@ Summary: Additional tuned profile(s) targeted to Network Function Virtualization Requires: %{name} = %{version} Requires: %{name}-profiles-realtime = %{version} Requires: tuna -%if %{with tscdeadline_latency} -Requires: %{name}-profiles-nfv-host-bin = %{version} -%endif -%if 0%{?rhel} >= 7 && %{without tscdeadline_latency} +%if 0%{?rhel} == 7 Requires: qemu-kvm-tools-rhev %endif %description profiles-nfv-host Additional tuned profile(s) targeted to Network Function Virtualization (NFV) host. -%if %{with tscdeadline_latency} -%package profiles-nfv-host-bin -Summary: Binaries that are needed for the Network Function Virtualization (NFV) host tuned profile. -Requires: %{name} = %{version} -ExclusiveArch: %{ix86} x86_64 - -%description profiles-nfv-host-bin -Binaries that are needed for the Network Function Virtualization (NFV) host tuned profile. -%endif - # this is kept for backward compatibility, it should be dropped for RHEL-8 %package profiles-nfv Summary: Additional tuned profile(s) targeted to Network Function Virtualization (NFV) @@ -225,17 +204,8 @@ It can be also used to fine tune your system for specific scenarios. %prep %setup -q -n %{name}-%{version}%{?prerel2} -%if %{with tscdeadline_latency} -cd .. && tar xf %{SOURCE1} -%endif %build -%if %{with tscdeadline_latency} -cd ../kvm-unit-tests-%{kvm_tests_snap} -./configure --cross-prefix=x86_64-linux-gnu- -make x86/tscdeadline_latency.flat -x86_64-linux-gnu-strip x86/tscdeadline_latency.flat -%endif %install make install DESTDIR=%{buildroot} DOCDIR=%{docdir} \ @@ -254,10 +224,6 @@ mkdir -p %{buildroot}%{_datadir}/tuned/grub2 mv %{buildroot}%{_sysconfdir}/grub.d/00_tuned %{buildroot}%{_datadir}/tuned/grub2/00_tuned rmdir %{buildroot}%{_sysconfdir}/grub.d -%if %{with tscdeadline_latency} -install -m 0644 ../kvm-unit-tests-%{kvm_tests_snap}/x86/tscdeadline_latency.flat %{buildroot}%{_datadir}/tuned -%endif - # ghost for persistent storage mkdir -p %{buildroot}%{_var}/lib/tuned @@ -471,12 +437,6 @@ fi %{_prefix}/lib/tuned/realtime-virtual-host %{_mandir}/man7/tuned-profiles-nfv-host.7* -%if %{with tscdeadline_latency} -%files profiles-nfv-host-bin -%defattr(-,root,root,-) -%{_datadir}/tuned/tscdeadline_latency.flat -%endif - %files profiles-nfv %defattr(-,root,root,-) %doc %{docdir}/README.NFV