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/SPECS/ceph.spec b/SPECS/ceph.spec index a908c80..8c0462b 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -153,7 +153,7 @@ ################################################################################# Name: ceph Version: 17.1.0 -Release: 0.7.123.g14f44feb%{?dist} +Release: 0.8.123.g14f44feb%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -2562,7 +2562,10 @@ 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 +* 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