diff options
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/Manifest.gz | bin | 11715 -> 11710 bytes | |||
| -rw-r--r-- | sys-cluster/ceph/Manifest | 9 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-16.2.0-liburing.patch | 35 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-16.2.2-cflags.patch | 13 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch | 24 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch | 69 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch | 13 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch | 12 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch | 20 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-17.2.4-cyclic-deps.patch | 13 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch | 12 |
11 files changed, 0 insertions, 220 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex f7830749ec7c..934f1c5a7fd8 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index d870884a35d0..35f5cc4f7c7b 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -5,29 +5,20 @@ AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f4940849636 AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94 AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e AUX ceph-16.2.0-jaeger-system-boost.patch 469 BLAKE2B ab46d53b0d129bacd4698ea73561b19e340772119e6a14dffa65b9aaccbf88c8b8ac26e919ab5af319fc21d4d4fb46e76652d99588e1261e484cf28d36fdf4d9 SHA512 22f8293138d928c0d0c1d977c15c355ce46b0e3c74ee88d29a04caa61024923d3032805f26e4115fa3e6f0a7e3cfd3f58e3feda2b1665e8ae73d49b50270c053 -AUX ceph-16.2.0-liburing.patch 1331 BLAKE2B 1f0e2e209cb827526b76e28f1334619c4d0348e8aa4a552ab543089e1b346c8689b956e2ae510f033a077db1156555980616fa3869ce500e5477d5dc5d96d131 SHA512 e8d03f04cbc307b131a0a55cb90d8a568b78a8e8f294d7e4415b7da7acec05b4d1dc32632935841fe2a492de7ee8ff52e544aab91b838431fda3815ca377fa64 AUX ceph-16.2.0-rocksdb-cmake.patch 705 BLAKE2B d40371aa0163cd78dbe12b1db648f4884b762e2ec2485663aa5cda83aea2175c8ee9a6b1a54e5ed9d68fbfda8c0ee0ef7625a67d948b6259227e56fb0ee69b52 SHA512 0c974ea937644b98dde6f20f1cab9b39c73f7fd8cc0fa0991e05de2e0a39fe69dee60a981c0ae14386f8c0c5c4073d5c8573e3bd0fa47d58b754351329eda220 AUX ceph-16.2.0-spdk-tinfo.patch 344 BLAKE2B ea46ab83836ebc9ed96714e0ed3c3e8b00a221296ddf9b10a99eb5591740a844067078820d79ae784cdb600c97e2969e81c65a4fe3b958bcc9910f7cecb1a6fe SHA512 31b9ae63c8f1722e4834034ed04cfc9ab47665ecd8f24da356897b0c52787096acbfc9cccf600655938da0f9f39200c2470cdb087f389adba975b6d830e7228d -AUX ceph-16.2.2-cflags.patch 540 BLAKE2B d7f7ce9e65d59b7a9594f4cd34091df8b496d03cedfa814a14165d51ec0daa38ad0124fbfa62d9ee7cf2895676248b14b45a38f310efb544e61e9672c58fb25d SHA512 d65b2b33f2e43169e5131ef3ca51617931fc3d362af8c79bef2baa2bbee6495729ee7a4fca4401a6be716283fcdf83511bdfb90e0c4b526b90e91c9c32591439 -AUX ceph-17.2.0-cyclic-deps.patch 1045 BLAKE2B 9605cbc3fb738030080871c55df86f6c13776e19ca8d9a3d80df73a67672cf4b697decaeab1462f8795744645d462271db0696339ece16562fc51aa1c316ddab SHA512 94773a40ad89fe05a098aa6d4460e2d3dad2dfa2792f3e2e912daac22f1ac7baec9b64c857fbfa36b753fa3bdf9a366429c2f4a4df5d4d792e03672a48c238d9 -AUX ceph-17.2.0-deprecated-boost.patch 2451 BLAKE2B 8fcf2f55a80840ef2452c45ea964aa375f1972dc441dcd5cdf4bcda9c4b69e179d98bfe0959be40994263823e715d0c8b1631e30cdb2d75144400543b07a3281 SHA512 505bb4e50ccc9d8fc7f1540950eaf59984204966b3faa60301034b80ee8f85ca1f45998ae99a8b960a288feac32bfd780e87db94839379c6b6343fc081a515ef AUX ceph-17.2.0-findre2.patch 709 BLAKE2B b7b044e71206ada569fd64242256c85932ca3dc34d5be4520ce0d420838045ca26c5a7c8212762af217adf245b18197c1aa4f0bf69e8d80c3c330b0d40bccbb4 SHA512 990d70f656bb8a3a9904c7235a48622e0a2bbdf3b751b4bd8603b2078d549a7b6dcbdf204a88512c525c2a95dbaa0ac792aafa5cf565faf91a4417923e7ae57b -AUX ceph-17.2.0-fuse3.patch 301 BLAKE2B 54dd764be7e7d428c6db38d2c8b9d168598c3d4195e1f0f43073d259215dd8268e1bbf14d6586bcf6cb1bdd67a25e6742e74b1f16b4ceba7e6fad37af682b9c8 SHA512 143dcba141c01828a9672096b26bee817189b8fe742e6816e304eb4147015de2df5d74b474d1a5dde84f13e5e6060c17756a8a04e7d6894fb4894ed933b37b39 AUX ceph-17.2.0-gcc12-header.patch 859 BLAKE2B abe8b4caa7ff71f7d09b26ffce2a45c85ec8f90c871de40ec5277ab34214dbcfd3bdce8683e1876a175c44f0cb136f008cea2e6e670c6b99c2be2e7b6eca0b5c SHA512 3e4d2e65d308e59171738a853c35da33e2abc8941d2593dcf49a06b9d888b52ab26d7d184e08446c1080111e516bca012cee471d580122c7c8a153ca063ed971 -AUX ceph-17.2.0-install-dbstore.patch 493 BLAKE2B e54ffbda69e86ba0b869f02b16055c89d93f58d680bc931c73aeccfb7efbc890b25f7d4f081f033531d4356faf55628e21ba81aeeb4acd907e437553d15ea10f SHA512 c13e73d0471a47bbcbc3c1b5ccdbf00eb72efa31530cafc54d15d8d1aa2da32465bf3a4c9a27568a3fcbfa1117e920c6b687cabf714fa9eedfd2a50a4d417613 AUX ceph-17.2.0-osd_class_dir.patch 486 BLAKE2B 7d9e144ab40e5e2f73a1412a65b27ffda74bf742d8499845a8dd43d42b18294ca5da9feca6f7345be950cf98b9e30f654a7ed40e9b7159a0aa5fe4462d6b0197 SHA512 02b7b685655f7d7b11744fabea2cb342bf6564a7fe068b783769276b9604c1320b83daad7078190fd293b9dadf06e6f657db35125e28dfa9619aac2179150bd7 AUX ceph-17.2.0-pybind-boost-1.74.patch 845 BLAKE2B b862b1abf61c0f5cc17964c86073a083b217f01ca5ae725bfe07ba13702e2d835bf8ccc4b5fae4b3138230b36722f4de0c8176811d6eefc1523e1fcb4848b744 SHA512 525b5df44f0de71ab0b2024c8bc0ccf98740a0befac4b032ae9a0fb6e2a05926d7171ae4b0af4ba32e71c9e04fe90aa192a2e3ae433242a62fa4e4efdc855321 -AUX ceph-17.2.0-system-opentelemetry.patch 699 BLAKE2B 3a8d9f2173227ac457a9d79e2a58f162ddfdcbdabfe76c9d9dd7eec4d89c28158b4e8e566abf8870fe31d8743549bd26144b329347be7ccdf63dbdd774ad862a SHA512 27463ebcafcc3967853328be349f8da6a726e82a9a11c7922d82c26ab8a12954bebbeb5c050b3fe291d5083babe13575f24b3a5346275579e47997d72c52afc5 AUX ceph-17.2.1-no-virtualenvs.patch 2780 BLAKE2B c1a752893800344a89321c76763268453de3fb275a7e952bdd81c6356d3e5aec48fb8623025c5d4fb7b0281b7d31272c145ef7d921c42c41d858f46105301eec SHA512 53bb81846633e6ff480d46c777b46bf6af2dd07817c84413c772836d7815e5a38c7b61c903af32434896041617175afaaeea6f5618ef5fbec0ad9afd7d7aa8f6 AUX ceph-17.2.3-flags.patch 782 BLAKE2B 08cd4fefdce90bc42b9c4e3caff805b1d8c9d011a96d3d2562b2a5cecf25b1b20c65a0cb8e90c0972e6708088feeecd3f829d3fd614b41289bf7f0d2d6d357fe SHA512 65bbdeed0f835a5444bd468dce5e78bb43284f1cb96c3ecdbc63b267213b251c9ad18291f47cb4f604e6817e0bf4aab025b8b67c5c0877cd58f4981d4f65ccec -AUX ceph-17.2.4-cyclic-deps.patch 562 BLAKE2B 4562e7b6afdb23e2d0c65c5db61aef6ce7d313716ef1e40c5b12a6afcb91ae8a38ead8432fe6ee93eeee12444c5b971d9c2ccb866c20806b8f3a57c9d8668b3c SHA512 5028bda954938a8718be6bc4729e816a178a2f47c3a2eeffdcb6b357d054fe236eba54fb0067dfbf6f6a78b5f6d805fe427f0d2e5b0349a08b2404604083132c AUX ceph-17.2.5-boost-1.81.patch 1456 BLAKE2B 0dbff43d17f099242e1bf0d44f6c46c6175a4c9221fdd904a152cab8a1105cb94960b7519471d86a359c35a356a7c793de2a2ac7d3cb7880dcb044ad93ac44e4 SHA512 2dcb4d7e42ab71c97c601a7171075077966c6d3bfea1a0cc7676bcc03bb3bf5a4fca774bca571c908a6450098b48951ac5fc12f6121e015b6ac56deb5d514048 AUX ceph-17.2.5-gcc13-deux.patch 2775 BLAKE2B 9ff9a80a87417206099490d47027df0d758aa5347a09840bc736a1a7a26f613226e681e2ee7a77d85ca9e97891ca79013ca2fd33500216abe5bcd2b4895b7226 SHA512 1ac1d35c77c608fe3bb0dd0e965817ff2d4eb4a02216f7eb41a20c505e5be9eccac729c3490a2466d3251f314442296cfb7b110c62828f584ddb5bab6116d02c AUX ceph-17.2.5-suppress-cmake-warning.patch 370 BLAKE2B 225ee73ddc24e3b398243603292949da09417c4c928daf0328729d8a69a475e6e5cdd2c9911c4c2ff6f3a6fea8b785a210e4beab5dc7bd910e390e84aa8e4b61 SHA512 e71ead89e494ac5639c08764b4d7bc3a96f87bac4ea8f9adb3e29c568f5d970551bc568c55adfd1b21be575db39a6f494de3e9d091d4ae8c04d2d5421be24f4f AUX ceph-17.2.6-arrow-flatbuffers-c++14.patch 3905 BLAKE2B 89e1860ff9be4ae899d99f71986a6616636dd8f5c6e1e06fdb2f5500cf86eb374b65f0364b4ca23e3c933ce3f705a0c0b6125bac77b4d66cb76ee1b4a289ba43 SHA512 8be91877d6d6f64b385e8a3914be761ecff8fb6575480e054aa738b036eace86a4dc923b3de6f554925bde55e95b2a26fd6bb2bf6ec552b12db0801600e50a60 AUX ceph-17.2.6-cmake.patch 3014 BLAKE2B bfe19b9667c6b2952b8d09978404d6c1600572ab8adfdd4533a6dd6249d87cefef7da605260612f78a35d9f6af177487bb0a5db88a42e5a8660fc54b0c12ee5b SHA512 b007de53dd0e1e1cc972c9c98205d0957e0d568fadc2d9e4588b5c13e80e4f24915c0e48b347093c7039b3a7e43ca6e9c51a0ebf51a016270ff40e634857ba68 AUX ceph-17.2.6-link-boost-context.patch 522 BLAKE2B 7f50f179324d74a372a038cb183297f9ecac7095a71a810d0d8063d2f80c31013db029e0067ab3b689faa1d4967ed04e077f279a203414e3ce49ddbc6b552e2c SHA512 3b15869a5e9bddbec752f3f612c4c53bf95c8da21a573b92af90f0f9823dddcdeaffef850c2d84bb4ee8bde8ce30a92e0f911c0e9e9007fb44aa8279b5cbec5e -AUX ceph-17.2.7-fmt-fixes.patch 319 BLAKE2B ff33742229a2372a7efdf58096ba38aa16e07419045d9c99c6dd02a2e2e2f90956c9eff691559fe6f2792006a86526ad3280e665d5d79a7b84a501b615fe93a7 SHA512 fe9b3c260ded9af6eabb55de0629afc2cb4de0bd1c5d172537c6a870127054ae7d6e7c4c24675ed99f4c0276cf9f98be9431e6d6a5107d429c1d7126a21669e7 AUX ceph-18.2.0-cyclic-deps.patch 513 BLAKE2B ac3614a17fe03a1b1d1fb1818bfee058158a9df2fb96180e9071f1f6adda9dc784da1028bd0798d3502494a5a0ceb1b9dbb82049719bf0afb514e4a501059b2c SHA512 ba4cee763adae237a26dc766a7164031fcb12a2c5d7924a668bc1b70b3055ce1548f08611f87ef8d1bebafdc4c396a018f6d69f7e8b1a14a76df5f4b7968a577 AUX ceph-18.2.0-cython3.patch 1130 BLAKE2B 9ec4d3f2a5581577c7631fedf697782cc214d6c11ad849a432113e8243d5d4d79d2824f49c525ac3f23d95e33c7fd2b5f7c67abf9f33817cfaa15dcd49bd98b7 SHA512 b5a3b9df9dcfc141c636db4981290595c39969850f0d55d42803710183a58333c3cd1a5bf1e686021c87b9f3f4b7de6076bd2aa2cd56053c019c1369ff94ccc8 AUX ceph-18.2.0-system-opentelemetry.patch 660 BLAKE2B f9abe4bade9675c3adb8d0f984603395a3ca24b8adf862cacf10510dd0db29e730e282d2f7936bb987f58935793d790011a61e52b737bb184b948176aa264d23 SHA512 0ae4455be748bcd9f859e44042b19746c3e931cf12dc664346cf5951c2b414b1c4806174298be8ca9f234b3a09868648e8d2b952af8e1e8668016600c5386726 diff --git a/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch b/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch deleted file mode 100644 index dd248d51ac61..000000000000 --- a/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/cmake/modules/Finduring.cmake b/cmake/modules/Finduring.cmake -index 10c8de4255..c0a4dadfe4 100644 ---- a/cmake/modules/Finduring.cmake -+++ b/cmake/modules/Finduring.cmake -@@ -8,10 +8,10 @@ find_path(URING_INCLUDE_DIR liburing.h) - find_library(URING_LIBRARIES liburing.a liburing) - - include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES URING_INCLUDE_DIR) -+pkg_check_modules(URING REQUIRED liburing) - - if(uring_FOUND AND NOT TARGET uring::uring) -- add_library(uring::uring UNKNOWN IMPORTED) -+ add_library(uring::uring ALIAS ${URING_LIBRARIES}) - set_target_properties(uring::uring PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${URING_INCLUDE_DIR}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" -diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt -index dc4f9b82ae..e39d690394 100644 ---- a/src/blk/CMakeLists.txt -+++ b/src/blk/CMakeLists.txt -@@ -52,10 +52,11 @@ endif() - - if(WITH_LIBURING) - if(WITH_SYSTEM_LIBURING) -- find_package(uring REQUIRED) -+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}../../cmake/modules/") -+ pkg_check_modules(URING REQUIRED liburing) - else() - include(Builduring) - build_uring() - endif() -- target_link_libraries(blk PRIVATE uring::uring) -+ target_link_libraries(blk PRIVATE ${URING_LIBRARIES}) - endif() diff --git a/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch b/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch deleted file mode 100644 index 8c7bb79803c8..000000000000 --- a/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake -index ba86ecaa63..b969c42911 100644 ---- a/cmake/modules/BuildBoost.cmake -+++ b/cmake/modules/BuildBoost.cmake -@@ -62,7 +62,7 @@ function(do_build_boost version) - else() - list(APPEND boost_features "address-model=32") - endif() -- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX -+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX - list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") - - set(boost_with_libs) diff --git a/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch b/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch deleted file mode 100644 index e9177cc02764..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/store/dbstore/CMakeLists.txt -index 143ede3c094c9..18e032b73f54f 100644 ---- a/src/rgw/store/dbstore/CMakeLists.txt -+++ b/src/rgw/store/dbstore/CMakeLists.txt -@@ -47,7 +47,7 @@ else() - endif() - - include_directories(${CMAKE_INCLUDE_DIR}) --add_library(dbstore ${dbstore_mgr_srcs}) -+add_library(dbstore STATIC ${dbstore_mgr_srcs}) - target_link_libraries(dbstore ${CMAKE_LINK_LIBRARIES}) - - # testing purpose -diff --git a/src/rgw/store/dbstore/sqlite/CMakeLists.txt b/src/rgw/store/dbstore/sqlite/CMakeLists.txt -index cce59b9ec0aa9..909765e3058b6 100644 ---- a/src/rgw/store/dbstore/sqlite/CMakeLists.txt -+++ b/src/rgw/store/dbstore/sqlite/CMakeLists.txt -@@ -12,5 +12,5 @@ include_directories(${CMAKE_INCLUDE_DIR}) - 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/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch b/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch deleted file mode 100644 index 64b6d5c614c8..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc -index ad791ece4f7..2f78fd02bf9 100644 ---- a/src/common/ConfUtils.cc -+++ b/src/common/ConfUtils.cc -@@ -26,7 +26,7 @@ - #include <boost/algorithm/string.hpp> - #include <boost/algorithm/string/trim_all.hpp> - #include <boost/spirit/include/qi.hpp> --#include <boost/spirit/include/phoenix.hpp> -+#include <boost/phoenix.hpp> - #include <boost/spirit/include/support_line_pos_iterator.hpp> - - #include "include/buffer.h" -diff --git a/src/mds/MDSAuthCaps.cc b/src/mds/MDSAuthCaps.cc -index b78ebd6615b..f8158be6866 100644 ---- a/src/mds/MDSAuthCaps.cc -+++ b/src/mds/MDSAuthCaps.cc -@@ -17,8 +17,8 @@ - #include <errno.h> - - #include <boost/spirit/include/qi.hpp> --#include <boost/spirit/include/phoenix_operator.hpp> --#include <boost/spirit/include/phoenix.hpp> -+#include <boost/phoenix/operator.hpp> -+#include <boost/phoenix.hpp> - - #include "common/debug.h" - #include "MDSAuthCaps.h" -diff --git a/src/mgr/MgrCap.cc b/src/mgr/MgrCap.cc -index cba758083c3..6e5e1f9bb99 100644 ---- a/src/mgr/MgrCap.cc -+++ b/src/mgr/MgrCap.cc -@@ -16,7 +16,7 @@ - #include <boost/spirit/include/qi_uint.hpp> - #include <boost/spirit/include/qi.hpp> - #include <boost/fusion/include/std_pair.hpp> --#include <boost/spirit/include/phoenix.hpp> -+#include <boost/phoenix.hpp> - #include <boost/fusion/adapted/struct/adapt_struct.hpp> - #include <boost/fusion/include/adapt_struct.hpp> - #include <boost/algorithm/string/predicate.hpp> -diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc -index e1dc3723965..0ff9fefdd15 100644 ---- a/src/mon/MonCap.cc -+++ b/src/mon/MonCap.cc -@@ -16,7 +16,7 @@ - #include <boost/spirit/include/qi_uint.hpp> - #include <boost/spirit/include/qi.hpp> - #include <boost/fusion/include/std_pair.hpp> --#include <boost/spirit/include/phoenix.hpp> -+#include <boost/phoenix.hpp> - #include <boost/fusion/adapted/struct/adapt_struct.hpp> - #include <boost/fusion/include/adapt_struct.hpp> - #include <boost/algorithm/string/predicate.hpp> -diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc -index e7bf0582799..f847e80e337 100644 ---- a/src/osd/OSDCap.cc -+++ b/src/osd/OSDCap.cc -@@ -14,8 +14,8 @@ - - #include <boost/config/warning_disable.hpp> - #include <boost/spirit/include/qi.hpp> --#include <boost/spirit/include/phoenix_operator.hpp> --#include <boost/spirit/include/phoenix.hpp> -+#include <boost/phoenix/operator.hpp> -+#include <boost/phoenix.hpp> - #include <boost/algorithm/string/predicate.hpp> - - #include "OSDCap.h" diff --git a/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch b/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch deleted file mode 100644 index 59b2be6ffd80..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e95019cedb2..814c7f4d0b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -178,7 +178,7 @@ endif() - - option(WITH_FUSE "Fuse is here" ON) - if(WITH_FUSE) -- find_package(FUSE) -+ find_package(FUSE 3.0) - set(HAVE_LIBFUSE ${FUSE_FOUND}) - endif() - diff --git a/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch b/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch deleted file mode 100644 index e50030071c81..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/store/dbstore/CMakeLists.txt -index 143ede3c094..204ef653010 100644 ---- a/src/rgw/store/dbstore/CMakeLists.txt -+++ b/src/rgw/store/dbstore/CMakeLists.txt -@@ -24,6 +24,7 @@ if(WITH_JAEGER) - list(APPEND link_targets ${jaeger_base}) - endif() - target_link_libraries(dbstore_lib PUBLIC ${link_targets}) -+install(TARGETS dbstore_lib DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} dbstore_lib) - diff --git a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch deleted file mode 100644 index 1b4e614bb517..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 30cf3605468..902e2123d04 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -430,9 +430,12 @@ add_dependencies(common-objs legacy-option-headers) - - if(WITH_JAEGER) - find_package(thrift 0.13.0 REQUIRED) -- include(BuildOpentelemetry) -- build_opentelemetry() -- set(jaeger_base opentelemetry::libopentelemetry thrift::libthrift) -+ find_package(opentelemetry-cpp REQUIRED) -+ set(jaeger_base -+ opentelemetry-cpp::common -+ opentelemetry-cpp::trace -+ opentelemetry-cpp::jaeger_trace_exporter -+ thrift::libthrift) - add_dependencies(common-objs ${jaeger_base}) - target_link_libraries(common-objs ${jaeger_base}) - endif() diff --git a/sys-cluster/ceph/files/ceph-17.2.4-cyclic-deps.patch b/sys-cluster/ceph/files/ceph-17.2.4-cyclic-deps.patch deleted file mode 100644 index 6040906a3f19..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.4-cyclic-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/store/dbstore/CMakeLists.txt -index 1feac6dcee0..586d0dbb961 100644 ---- a/src/rgw/store/dbstore/CMakeLists.txt -+++ b/src/rgw/store/dbstore/CMakeLists.txt -@@ -16,7 +16,7 @@ set(dbstore_mgr_srcs - 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) diff --git a/sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch b/sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch deleted file mode 100644 index 5d8ee2af9ba3..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc -index 4feabcda459..6b9a9bf86ce 100644 ---- a/src/osd/SnapMapper.cc -+++ b/src/osd/SnapMapper.cc -@@ -17,6 +17,7 @@ - #include <fmt/printf.h> - #include <fmt/ranges.h> - -+#include "include/object_fmt.h" - #include "osd/osd_types_fmt.h" - #include "SnapMapReaderI.h" - |