diff --git a/.ceph.metadata b/.ceph.metadata index bcf77bd..f73de2f 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -9724d3d1857e95b2df6053240b224b14c171733c SOURCES/ceph-17.1.0-123-g14f44feb.tar.bz2 +800ebe357068e00d7f4e2e4354a1cff00ec2be3f SOURCES/ceph-17.1.0-175-g086c8f84.tar.bz2 diff --git a/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch b/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch index 99510da..1adc56a 100644 --- a/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch +++ b/SOURCES/0018-src-rgw-store-dbstore-CMakeLists.txt.patch @@ -1,6 +1,32 @@ ---- ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/CMakeLists.txt.orig 2022-02-12 08:17:16.038116513 -0500 -+++ ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/CMakeLists.txt 2022-02-12 08:40:43.564440428 -0500 -@@ -47,7 +47,7 @@ +--- ceph-17.1.0/src/rgw/store/dbstore/sqlite/CMakeLists.txt.orig 2022-03-01 08:19:04.974902872 -0500 ++++ ceph-17.1.0/src/rgw/store/dbstore/sqlite/CMakeLists.txt 2022-03-11 07:55:16.236261471 -0500 +@@ -12,5 +12,5 @@ + set(SQLITE_COMPILE_FLAGS "-DSQLITE_THREADSAFE=1") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SQLITE_COMPILE_FLAGS}") + +-add_library(sqlite_db ${sqlite_db_srcs}) ++add_library(sqlite_db STATIC ${sqlite_db_srcs}) + target_link_libraries(sqlite_db sqlite3 dbstore_lib rgw_common) +--- ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt.orig 2022-02-28 14:11:49.987077811 -0500 ++++ ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt 2022-03-11 08:40:13.409682698 -0500 +@@ -16,7 +16,7 @@ + dbstore_mgr.cc + ) + +-add_library(dbstore_lib ${dbstore_srcs}) ++add_library(dbstore_lib STATIC ${dbstore_srcs}) + target_include_directories(dbstore_lib PUBLIC "${CMAKE_SOURCE_DIR}/src/fmt/include") + target_include_directories(dbstore_lib PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw") + set(link_targets spawn) +@@ -38,6 +38,7 @@ + + # add pthread library + set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} pthread) ++set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} global) + + find_package(gtest QUIET) + if(WITH_TESTS) +@@ -47,7 +48,7 @@ endif() include_directories(${CMAKE_INCLUDE_DIR}) @@ -9,12 +35,3 @@ target_link_libraries(dbstore ${CMAKE_LINK_LIBRARIES}) # testing purpose ---- ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/sqlite/CMakeLists.txt.orig 2022-02-12 08:18:04.843227147 -0500 -+++ ceph-17.0.0-10335-gfd206722/src/rgw/store/dbstore/sqlite/CMakeLists.txt 2022-02-12 08:18:17.871989500 -0500 -@@ -12,5 +12,5 @@ - set(SQLITE_COMPILE_FLAGS "-DSQLITE_THREADSAFE=1") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SQLITE_COMPILE_FLAGS}") - --add_library(sqlite_db ${sqlite_db_srcs}) -+add_library(sqlite_db STATIC ${sqlite_db_srcs}) - target_link_libraries(sqlite_db sqlite3 dbstore_lib rgw_common) diff --git a/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch b/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch new file mode 100644 index 0000000..d2f6024 --- /dev/null +++ b/SOURCES/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch @@ -0,0 +1,22 @@ +--- ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake.orig 2022-04-08 11:27:53.593570634 -0400 ++++ ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake 2022-04-08 11:28:20.778087653 -0400 +@@ -1991,7 +1991,7 @@ + + if((NOT ARROW_SIMD_LEVEL STREQUAL "NONE") OR (NOT ARROW_RUNTIME_SIMD_LEVEL STREQUAL "NONE" + )) +- set(xsimd_SOURCE "BUNDLED") ++ set(xsimd_SOURCE "SYSTEM") + resolve_dependency(xsimd) + # TODO: Don't use global includes but rather target_include_directories + include_directories(SYSTEM ${XSIMD_INCLUDE_DIR}) +--- ceph-17.1.0-175-g086c8f84/cmake/modules/FindArrow.cmake.orig 2022-04-08 18:36:33.964723501 -0400 ++++ ceph-17.1.0-175-g086c8f84/cmake/modules/FindArrow.cmake 2022-04-08 18:36:50.175437463 -0400 +@@ -393,7 +393,7 @@ + "${ARROW_HOME}" + arrow + arrow/api.h +- Arrow ++ arrow + arrow) + + if(ARROW_HOME) diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index ea5956b..53ca206 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -101,6 +101,8 @@ # distros that do _not_ ship cmd2/colorama %bcond_with cephfs_shell %endif +%bcond_without system_arrow +%bcond_without system_utf8proc %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 %endif @@ -151,7 +153,7 @@ ################################################################################# Name: ceph Version: 17.1.0 -Release: 0.7.123.g14f44feb%{?dist} +Release: 0.9.175.g086c8f84%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -168,7 +170,7 @@ Group: System/Filesystems %endif URL: http://ceph.com/ #Source0: ceph-17.1.0.tar.gz -Source0: ceph-17.1.0-123-g14f44feb.tar.bz2 +Source0: ceph-17.1.0-175-g086c8f84.tar.bz2 Patch0001: 0001-src-common-crc32c_intel_fast.patch Patch0003: 0003-src-common-bitstr.h.patch Patch0008: 0008-cmake-modules-Finduring.cmake.patch @@ -179,6 +181,7 @@ Patch0016: 0016-src-tracing-patch Patch0017: 0017-gcc-12-omnibus.patch Patch0018: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch Patch0019: 0019-cmake-modules-CheckCxxAtomic.cmake.patch +Patch0020: 0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -288,10 +291,11 @@ BuildRequires: socat %if 0%{with zbd} BuildRequires: libzbd-devel %endif +BuildRequires: thrift-devel >= 0.13.0 +BuildRequires: re2-devel %if 0%{with jaeger} BuildRequires: bison BuildRequires: flex -BuildRequires: thrift-devel >= 0.13.0 %if 0%{?fedora} || 0%{?rhel} BuildRequires: json-devel %endif @@ -304,6 +308,15 @@ BuildRequires: libevent-devel BuildRequires: libpmem-devel BuildRequires: libpmemobj-devel %endif +%if 0%{with system_arrow} +BuildRequires: libarrow-devel +BuildRequires: parquet-libs-devel +%else +BuildRequires: xsimd-devel +%endif +%if 0%{with system_utf8proc} +BuildRequires: utf8proc-devel +%endif %if 0%{with seastar} BuildRequires: c-ares-devel BuildRequires: gnutls-devel @@ -1253,7 +1266,7 @@ This package provides Ceph default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-17.1.0-123-g14f44feb +%autosetup -p1 -n ceph-17.1.0-175-g086c8f84 %build # Disable lto on systems that do not support symver attribute @@ -1286,6 +1299,9 @@ export LDFLAGS="$RPM_LD_FLAGS" %if 0%{with seastar} # seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk() export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') +# remove from CFLAGS too because it causes the arrow submodule to fail with: +# warning _FORTIFY_SOURCE requires compiling with optimization (-O) +export CFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') %endif env | sort @@ -1386,6 +1402,12 @@ mkdir -p %{_vpath_builddir} %if 0%{?rhel} -DWITH_FMT_HEADER_ONLY:BOOL=ON \ %endif +%if 0%{with system_arrow} + -DWITH_SYSTEM_ARROW:BOOL=ON \ +%endif +%if 0%{with system_utf8proc} + -DWITH_SYSTEM_UTF8PROC:BOOL=ON \ +%endif -DWITH_GRAFANA:BOOL=ON %if %{with cmake_verbose_logging} @@ -2561,7 +2583,13 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog -* Mon Mar 28 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.5.123.g14f44feb +* Fri Apr 8 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.9.175.g086c8f84 +- 17.1.0 snapshot 175 + +* Tue Apr 5 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.8.123.g14f44feb +- 17.1.0 snapshot 123, again + +* Mon Mar 28 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.7.123.g14f44feb - 17.1.0 snapshot 123 * Mon Mar 21 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.5.56-g60fdd357