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

rocksdb not available in el8+, use bundled rocksdb

Browse Source 
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2021-02-04 11:08:44 -05:00
parent 415b03ce74
commit 07c18dd027
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ceph.spec
View File

@ -113,7 +113,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 16.1.0 Version: 16.1.0
Release: 0.2.snapshot%{?dist} Release: 0.3.snapshot%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
%endif %endif
@ -168,7 +168,9 @@ BuildRequires: cmake > 3.5
BuildRequires: cryptsetup BuildRequires: cryptsetup
BuildRequires: fuse3-devel BuildRequires: fuse3-devel
BuildRequires: fmt-devel BuildRequires: fmt-devel
%if 0%{?fedora}
BuildRequires: rocksdb-devel BuildRequires: rocksdb-devel
%endif
BuildRequires: liburing-devel BuildRequires: liburing-devel
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
# devtoolset offers newer make and valgrind-devel, but the old ones are good # devtoolset offers newer make and valgrind-devel, but the old ones are good
@ -1213,11 +1215,7 @@ export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
# Parallel build settings ... # Parallel build settings ...
CEPH_MFLAGS_JOBS="%{?_smp_mflags}" CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
%ifarch s390 s390x
CEPH_SMP_NCPUS="4"
%else
CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//') CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
%endif
%if 0%{?__isa_bits} == 32 %if 0%{?__isa_bits} == 32
# 32-bit builds can use 3G memory max, which is not enough even for -j2 # 32-bit builds can use 3G memory max, which is not enough even for -j2
CEPH_SMP_NCPUS="1" CEPH_SMP_NCPUS="1"
@ -1277,7 +1275,9 @@ cd build
-DWITH_OCF=ON \ -DWITH_OCF=ON \
%endif %endif
-DWITH_REENTRANT_STRSIGNAL=ON \ -DWITH_REENTRANT_STRSIGNAL=ON \
%if 0%{?fedora}
-DWITH_SYSTEM_ROCKSDB=ON \ -DWITH_SYSTEM_ROCKSDB=ON \
%endif
-DWITH_SYSTEM_LIBURING=ON \ -DWITH_SYSTEM_LIBURING=ON \
-DWITH_SYSTEM_BOOST=ON \ -DWITH_SYSTEM_BOOST=ON \
%if 0%{with cephfs_shell} %if 0%{with cephfs_shell}
@ -2426,11 +2426,14 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Thu Feb 4 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.3.snapshot
- rocksdb not available in el8+, use bundled rocksdb
* Mon Feb 1 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.2.snapshot * Mon Feb 1 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.2.snapshot
- libblk.so -> libblk.a - libblk.so -> libblk.a
- libneoradostest-support.so -> libneoradostest-support.a - libneoradostest-support.so -> libneoradostest-support.a
- w/ liburing-devel, -DWITH_SYSTEM_LIBURING - w/ liburing-devel, -DWITH_SYSTEM_LIBURING=ON
- w/ rocksdb-devel, -DWITH_SYSTEM_LIBURING - w/ rocksdb-devel, -DWITH_SYSTEM_ROCKSDB=ON
* Fri Jan 29 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.1.snapshot * Fri Jan 29 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.1.snapshot
- ceph 16.1.0 RC (ceph-16.1.0-43-g6b74fb5c) - ceph 16.1.0 RC (ceph-16.1.0-43-g6b74fb5c)