rpms/fio
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Allow building without nbd, rbd or rados"

Browse Source 
This reverts commit 5c317e794c.
This commit is contained in:
Eric Sandeen 2022-08-10 14:13:59 -05:00
parent c4a581dd31
commit 8218e32794
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fio.spec
View File

@ -9,18 +9,13 @@ Source0: http://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2
Source1: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2.asc
Source2: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/F7D358FB2971E0A6.asc
%bcond nbd 1
%bcond rbd 1
%bcond rados 1
BuildRequires: gcc
BuildRequires: gnupg2
BuildRequires: libaio-devel
BuildRequires: zlib-devel
BuildRequires: python3-devel
%if %{with nbd}
BuildRequires: libnbd-devel
%endif
BuildRequires: libcurl-devel
BuildRequires: openssl-devel
%ifarch x86_64 ppc64le
@ -29,10 +24,8 @@ BuildRequires: libpmemblk-devel
%endif
%ifnarch %{arm} %{ix86} ppc64le
%if %{with rbd}
BuildRequires: librbd1-devel
%endif
%endif
%ifnarch %{arm}
BuildRequires: numactl-devel
@ -49,22 +42,16 @@ BuildRequires: make
# or if the dependencies are too onerous.
Recommends: %{name}-engine-libaio
Recommends: %{name}-engine-http
%if %{with nbd}
Recommends: %{name}-engine-nbd
%endif
%ifarch x86-64 ppc64le
Recommends: %{name}-engine-dev-dax
Recommends: %{name}-engine-pmemblk
Recommends: %{name}-engine-libpmem
%endif
%ifnarch %{arm} %{ix86} ppc64le
%if %{with rados}
Recommends: %{name}-engine-rados
%endif
%if %{with rbd}
Recommends: %{name}-engine-rbd
%endif
%endif
%ifnarch %{arm}
Recommends: %{name}-engine-rdma
%endif
@ -91,14 +78,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description engine-http
HTTP engine for %{name}.
%if %{with nbd}
%package engine-nbd
Summary: Network Block Device engine for %{name}.
Requires: %{name}%{?_isa} = %{version}-%{release}
%description engine-nbd
Network Block Device (NBD) engine for %{name}.
%endif
%ifarch x86_64 ppc64le
%package engine-dev-dax
@ -134,16 +119,13 @@ on a persistent memory device through the PMDK libpmem library.
%endif
%ifnarch %{arm} %{ix86} ppc64le
%if %{with rados}
%package engine-rados
Summary: Rados engine for %{name}.
Requires: %{name}%{?_isa} = %{version}-%{release}
%description engine-rados
Rados engine for %{name}.
%endif
%if %{with rbd}
%package engine-rbd
Summary: Rados Block Device engine for %{name}.
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -151,7 +133,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description engine-rbd
Rados Block Device (RBD) engine for %{name}.
%endif
%endif
%ifnarch %{arm}
%package engine-rdma
@ -177,11 +158,7 @@ pathfix.py -i %{__python3} -pn \
sed -e 's,/usr/local/lib/,%{_libdir}/,g' -i os/os-linux.h
%build
%if %{with nbd}
./configure --disable-optimizations --enable-libnbd --dynamic-libengines
%else
./configure --disable-optimizations --dynamic-libengines
%endif
EXTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" make V=1 %{?_smp_mflags}
%install
@ -213,10 +190,8 @@ make install prefix=%{_prefix} mandir=%{_mandir} libdir=%{_libdir}/fio DESTDIR=$
%{_libdir}/fio/fio-libpmem.so
%endif
%if %{with nbd}
%files engine-nbd
%{_libdir}/fio/fio-nbd.so
%endif
%ifarch x86_64 ppc64le
%files engine-pmemblk
@ -224,16 +199,12 @@ make install prefix=%{_prefix} mandir=%{_mandir} libdir=%{_libdir}/fio DESTDIR=$
%endif
%ifnarch %{arm} %{ix86} ppc64le
%if %{with rados}
%files engine-rados
%{_libdir}/fio/fio-rados.so
%endif
%if %{with rbd}
%files engine-rbd
%{_libdir}/fio/fio-rbd.so
%endif
%endif
%ifnarch %{arm}
%files engine-rdma
@ -241,8 +212,9 @@ make install prefix=%{_prefix} mandir=%{_mandir} libdir=%{_libdir}/fio DESTDIR=$
%endif
%changelog
* Wed Aug 10 2022 Eric Sandeen <sandeen@redhat.com> - 3.32-1
* Wed Aug 10 2022 Eric Sandeen <sandeen@redhat.com> - 3.31-1
- New upstream version
- Revert with/without change below, does not pass build
* Wed Jul 27 2022 Amit Shah <amitshah@fedoraproject.og> - 3.30-3
- Allow building without nbd, rbd, rados support