diff --git a/.gitignore b/.gitignore index 070b178..702722f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ SOURCES/linux-5.7.tar.xz -SOURCES/stress-ng-0.12.06.tar.xz diff --git a/.rteval-loads.metadata b/.rteval-loads.metadata index b578ecf..105dcaa 100644 --- a/.rteval-loads.metadata +++ b/.rteval-loads.metadata @@ -1,2 +1 @@ 07e40057b78f1c9dd2b042056325d99fcf9f8a08 SOURCES/linux-5.7.tar.xz -0437f8abe3edb10b44e2205ad1e9c0187c6e7860 SOURCES/stress-ng-0.12.06.tar.xz diff --git a/SPECS/rteval-loads.spec b/SPECS/rteval-loads.spec index 579f854..0fc36f0 100644 --- a/SPECS/rteval-loads.spec +++ b/SPECS/rteval-loads.spec @@ -1,82 +1,35 @@ Name: rteval-loads Version: 1.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Source files for rteval loads Group: Development/Tools License: GPLv2 URL: https://git.kernel.org/pub/scm/utils/rteval/rteval.git Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%package -n stress-ng -Version: 0.12.06 -Release: 2%{?dist} -Summary: Stress test a computer system in various ways -Source1: https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-%{version}.tar.xz - -BuildRequires: make -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: kernel-headers -BuildRequires: keyutils-libs-devel -BuildRequires: libaio-devel -BuildRequires: libattr-devel -BuildRequires: libcap-devel -BuildRequires: libgcrypt-devel -BuildRequires: lksctp-tools-devel -BuildRequires: libatomic -BuildRequires: zlib-devel - -#Patches +BuildArch: noarch %description This package provides source code for system loads used by the rteval package -%description -n stress-ng -Stress test a computer system in various ways. It was designed to exercise -various physical subsystems of a computer as well as the various operating -system kernel interfaces. - %prep -%setup -q -b1 -n stress-ng-%{version} -%build -n stress-ng -export CFLAGS="%{optflags}" -export LDFLAGS="%{__global_ldflags}" -make +%build %install -rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}/usr/share/rteval/loadsource install -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/usr/share/rteval/loadsource -# stress-ng -install -p -m 755 -D stress-ng %{buildroot}%{_bindir}/stress-ng -install -p -m 644 -D stress-ng.1 %{buildroot}%{_mandir}/man1/stress-ng.1 -mkdir -p %{buildroot}%{_datadir}/bash-completion/completions -install -pm 644 bash-completion/stress-ng \ - %{buildroot}%{_datadir}/bash-completion/completions/stress-ng - -%clean -rm -rf ${RPM_BUILD_ROOT} - %files %defattr(-,root,root,-) %dir %{_datadir}/rteval/loadsource %{_datadir}/rteval/loadsource/* -%doc - -%files -n stress-ng -%license COPYING -%doc README -%{_bindir}/stress-ng -%{_mandir}/man1/stress-ng.1.gz -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/stress-ng %changelog +* Tue Oct 26 2021 John Kacur - 1.14-14 +- Remove stress-ng from rteval-loads +Resolves:rhbz#2007027 + * Wed Apr 28 2021 John Kacur - 1.14-13 - Rebuild rteval-build with a fixed binutils in brew - Bump the release number of stress-ng as well