summaryrefslogtreecommitdiff
path: root/sys-cluster
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/Manifest.gzbin11554 -> 11553 bytes
-rw-r--r--sys-cluster/ceph/Manifest8
-rw-r--r--sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch17
-rw-r--r--sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch9
-rw-r--r--sys-cluster/ceph/files/ceph-16.2.10-flags.patch14
-rw-r--r--sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch84
-rw-r--r--sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch40
-rw-r--r--sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch82
-rw-r--r--sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch13
-rw-r--r--sys-cluster/ceph/files/ceph.initd-r13115
10 files changed, 0 insertions, 382 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 7b3c56f2963e..e7cedccc86de 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
Binary files differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 4b26e5fed5e9..492f29c3bcd7 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -3,18 +3,12 @@ AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 BLAKE2B 684dfd301a144e29
AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a00a4fe595f900d9f676769614576c059513299c05cae1c982db8bdd3a571c04ace1ff1ea6171631c1373c408f465261b73e05f66580e SHA512 6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae
AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f49408496360fa24a433e9d6f3568749a6dfb415cbd17bfb950b9500f182c5141eab402686001f95e1611e60accdac7111ceca14f03b1ff8b4345c087f SHA512 ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94
-AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a177c1f39e7cf433ba52d03d73de4b45abc2db6742237c8044519337297025cf577d210ace81457ff05325073aa5bb43 SHA512 82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d
AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e
-AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb13df14574e48300d1331dc2b31353f1ccac40f723de501c6e33bc6f065f4b4500048de9d9b0bae646c76ba715eab580a SHA512 c2890202820d022bf610d6317b0a6e3521da2060bb12e39ba1a5c347096d5688adcd98b1cbf25ad33ddfa78d3cae42669c21f4e1dbe6eceb150e4ee17bece582
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.10-flags.patch 665 BLAKE2B 44d77ca5992c76dc6cf99fca4ca5deb6559b11f61839bd3c36eda5b71db774d18abaaa8b1e57a7286b45d775a45b8b26beef45a775e27aec34181de1623eab65 SHA512 a9480374cc8136e5013a33e93aff300ade1dfdc8a446ac8e91d9b15326caaf1557932806f45d122775540d717ddfac3f2a9dbd2d15bd71fdb5e8e86f2bd5925f
-AUX ceph-16.2.14-gcc13.patch 2683 BLAKE2B 92450cc3e51f6c266bd445bf50dd8bab4a800bd998781440bf689e290cf9d9ced8bcb570f09d037b7790a251ad30b7017a45a8dc363128230b908effe6acfcce SHA512 90ae1ffdb1b2c49f81a99781a020339edb261e55c86107b7a87605b5647c8372477fcbf840ca3b83ba31b133794399f6c8b91e46ee63aad84e401f038eb1998d
AUX ceph-16.2.2-cflags.patch 540 BLAKE2B d7f7ce9e65d59b7a9594f4cd34091df8b496d03cedfa814a14165d51ec0daa38ad0124fbfa62d9ee7cf2895676248b14b45a38f310efb544e61e9672c58fb25d SHA512 d65b2b33f2e43169e5131ef3ca51617931fc3d362af8c79bef2baa2bbee6495729ee7a4fca4401a6be716283fcdf83511bdfb90e0c4b526b90e91c9c32591439
-AUX ceph-16.2.2-system-zstd.patch 1501 BLAKE2B 6540822407802dacb43c4fd9c432b45ec747a77d6892f2193fe55cb09da90b035d7630bdf5f9ec6f49df5e351c1d38c96cd14e9ed180bee897f11413ba53ed64 SHA512 5e21e29b30ee67411e3631fa65d0dc8a7b232e582c995049b4e89ea709e87a42edbf5cd4bbe535e62aebb7c9509a85b92c62e0f9914b2d4ee197994e2665139a
-AUX ceph-16.2.8-no-virtualenvs.patch 3650 BLAKE2B 3c350e1ff171ec40443bcb2e8b844192bf07d8cc84181b9c20b11bfd8785e7bbf029ee9a6abc1d52655618417769b7f32d3e758cc9456f38e7ea918499bd9ab5 SHA512 f82210448617f448205b8a51fc286fc88c149ec65eb23b4ea439e5e69ad07d30d9fb254e2ffac13b2d18c7be8a0d69110c089ff22a301ee0fe92357fcfde9c25
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
@@ -41,7 +35,6 @@ AUX ceph-18.2.1-gcc14-2.patch 10357 BLAKE2B f7ef39029eb330d9a5cf9846e64bc76c763e
AUX ceph-18.2.1-gcc14.patch 5949 BLAKE2B b42cd6cf53618a896c55171f9daf17525ae888f56b6890685d41f8fd7de5e2bf04bbc59a65c3027bd1c8e9f1ad6171c6bbcc4643be51e3ea3deced625900c80e SHA512 7dbb53629339d702e604314102ae3908ba8adfb0f850858e88727ab13d1e8081ea426048f1c9293fadc0551a4c38954bcaf0a44e37122db9b21355aa4033215b
AUX ceph-18.2.4-liburing.patch 986 BLAKE2B db36daa74b36f29888b1fd4ab7543177ef4229d924d484e200486d515684b66e676407678197a6f43c6d48e9bad0c3fb6c9333770e3ab302b0aa4b0912793f01 SHA512 4c5142a90aee0979cc31ab967cd8785df625c4c17f4b308f1fa429e3f601a7244fe3c7989990879877aa1a0a2aae0f9851920c56465766732fbe20aece59ac9f
AUX ceph-18.2.4-spdk.patch 475 BLAKE2B ecbd55f0037cf76dbb139114bbef6e657ace216bf54ed491e1836ce49e544ae08ccf06784669d7bfb729188b4ec953b67e0879d50ca3d9c3f371a2e93888856a SHA512 5ff92fd364a0ad10956def2506830b78a209c0dc4321b2e5a5d83bf95e175ef64090797fa18024451099135f04856df2ea9e65674548c16cef43b86b7a1f981b
-AUX ceph-19.1.0-boost-build-none-options.patch 488 BLAKE2B d033e512cadf8a55ab118104d6fb45d837cc3862d6957318ec3f247e0b4a91dfabfbbdd3a41ecb98efc21433d6911689da68561af129bb0438c5221a39f18f33 SHA512 22f8380e717e7f94f36cbaabe4bb2af24fe07b50267b68cc251140e0578578f140b27454c2addde0967e9ceafeda126fae890400a24aaae73f41a9b316b3b3ad
AUX ceph-19.2.0-importlib.patch 1722 BLAKE2B eb4ae542799f30f5b8d3e2092f622510c581b597cd83c46864815c99c62026ee0d8f09dd455b34fd284572bef54da310419106e83696cd2c0fb82116c9f5ee50 SHA512 cf35940018ac9742e0bce35339054298f68bba75de42de29f36e3e425a1971a69f237a80186513e5ad012c63d6e6e903efdeb095a0a08d5738b4729293b93e27
AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
@@ -49,7 +42,6 @@ AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9
AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02942590f90e41d646205c44c9d4c7778c844fcc268d69410a6e76ca825882a5e1d4b1e86b0123905b1d6c081de SHA512 8f169a73f21968f550c6fb21ca7b1efde522b7cccaae0e0c4e22c67ee9c7ccfec7845de3cf84af1075ac9f8840b044dc9440e7936fb9079899df06df350ff9f2
AUX ceph-tmpfilesd 29 BLAKE2B 02c5d6c59f6e93d03df3bb304529760824f64895f5bc0eff4a0a311013479e29cd3aa0fe554bbc65941838116d465b7df1ab351e2d80d7a4d1d109e26a7f0f2c SHA512 2d84199c6e57db1c0dd1074d94b899bf04c71ab0b10e91a34a0aa7c6a8136d34310ebe0967dcdde801f5b022502db00a891ce71af10c3ccef4ed396e8d316e15
AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c
-AUX ceph.initd-r13 3106 BLAKE2B 5ff61b3aae02888f67a86a92f11572957a25ce868587b0f720d19dea30e4ff9c04d1e0ae5ef36e83865f098eeea0d3291d404b4ff91a569c8f30e1258bd3c614 SHA512 9b27141b49a96fd18145a18f97748158bb49b73987cbe33758f183dad2d7aadfa6e5249e714188f593d382d7dfe1807f3b14ebdf6273400260f09378c5958e78
AUX ceph.initd-r14 3150 BLAKE2B 755b7f686f0d11057f03c7de204bfca1d1fb00ef4fad44966973412a6801bc0d121bcd42492883a5b9a4f3e947b9fbf569c5a20c977e7e8e29a7b56f320ed64e SHA512 11ec19c1b114525aad0b6220d6f750c1e0c4500754bfdf7e71ffeee02007d0a353f733ec3a7c307a52fae983c1b087445d54f75d53a702becf3f58bc1279b023
AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b
AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
deleted file mode 100644
index be133c121d0c..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ceph-13.2.1/cmake/modules/Distutils.cmake.old 2018-07-26 17:39:56.000000000 -0000
-+++ ceph-13.2.1/cmake/modules/Distutils.cmake 2018-12-24 05:43:51.566174070 -0000
-@@ -58,8 +62,13 @@
- function(distutils_install_cython_module name)
- get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
- get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK)
-- set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}")
-+ string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
-+ list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
-+ list(APPEND cflags -D'void0=dead_function\(void\)')
-+ list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
-+ string(REPLACE ";" " " cflags "${cflags}")
-+ set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}")
- set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared")
- install(CODE "
- set(ENV{CC} \"${PY_CC}\")
- set(ENV{LDSHARED} \"${PY_LDSHARED}\")
diff --git a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch b/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
deleted file mode 100644
index 3ea6eadbb86f..000000000000
--- a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- ceph-15.2.3.orig/cmake/modules/BuildSPDK.cmake 2020-05-29 09:24:50.000000000 -0700
-+++ ceph-15.2.3/cmake/modules/BuildSPDK.cmake 2020-06-01 10:36:14.629306433 -0700
-@@ -1,5 +1,5 @@
- macro(build_spdk)
-- set(DPDK_DIR ${CMAKE_BINARY_DIR}/src/dpdk)
-+ set(DPDK_DIR ${CMAKE_SOURCE_DIR}/src/dpdk)
- if(NOT TARGET dpdk-ext)
- include(BuildDPDK)
- build_dpdk(${DPDK_DIR})
diff --git a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch b/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
deleted file mode 100644
index 79002b3a5fce..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
-index 01a6fc500c8..9eb4658482f 100644
---- a/cmake/modules/Distutils.cmake
-+++ b/cmake/modules/Distutils.cmake
-@@ -90,7 +90,8 @@ function(distutils_add_cython_module target name src)
- CXX="${PY_CXX}"
- LDSHARED="${PY_LDSHARED}"
- OPT=\"-DNDEBUG -g -fwrapv -w\"
-- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-+ CFLAGS=${CMAKE_C_FLAGS}
-+ LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS}
- CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
- CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
- ${Python3_EXECUTABLE} ${setup_py}
diff --git a/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch b/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
deleted file mode 100644
index 7f84a19706dc..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/src/common/Cycles.h b/src/common/Cycles.h
-index 16e0aa67fc1..791be43469c 100644
---- a/src/common/Cycles.h
-+++ b/src/common/Cycles.h
-@@ -29,8 +29,9 @@
- */
-
-
--#ifndef CEPH_CYCLES_H
--#define CEPH_CYCLES_H
-+#pragma once
-+
-+#include <cstdint>
-
- /**
- * This class provides static methods that read the fine-grain CPU
-@@ -112,4 +113,3 @@ private:
- }
- };
-
--#endif // CEPH_CYCLES_H
-diff --git a/src/common/subsys_types.h b/src/common/subsys_types.h
-index 52171809b23..1a2ab796b6d 100644
---- a/src/common/subsys_types.h
-+++ b/src/common/subsys_types.h
-@@ -53,7 +53,7 @@ ceph_subsys_get_as_array() {
- #undef DEFAULT_SUBSYS
- }
-
--constexpr static std::uint8_t
-+constexpr static uint8_t
- ceph_subsys_get_max_default_level(const std::size_t subidx) {
- const auto item = ceph_subsys_get_as_array()[subidx];
- return std::max(item.log_level, item.gather_level);
-diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
-index c0a8173596e..8d982879aa9 100644
---- a/src/librbd/api/PoolMetadata.h
-+++ b/src/librbd/api/PoolMetadata.h
-@@ -9,6 +9,7 @@
-
- #include <map>
- #include <string>
-+#include <cstdint>
-
- namespace librbd {
-
-diff --git a/src/msg/async/crypto_onwire.h b/src/msg/async/crypto_onwire.h
-index 55f7550868f..2213c21d08d 100644
---- a/src/msg/async/crypto_onwire.h
-+++ b/src/msg/async/crypto_onwire.h
-@@ -95,7 +95,7 @@ public:
- // Transmitter can append extra bytes of ciphertext at the -final step.
- // This method return how much was added, and thus let client translate
- // plaintext size into ciphertext size to grab from wire.
-- virtual std::uint32_t get_extra_size_at_final() = 0;
-+ virtual uint32_t get_extra_size_at_final() = 0;
-
- // Instance of RxHandler must be reset before doing any decrypt-update
- // step. This applies also to situation when decrypt-final was already
-diff --git a/src/test/librados/op_speed.cc b/src/test/librados/op_speed.cc
-index 90c7bdac571..9452da6dcc9 100644
---- a/src/test/librados/op_speed.cc
-+++ b/src/test/librados/op_speed.cc
-@@ -9,7 +9,7 @@ int main() {
- for (int i = 0; i < to_create; ++i) {
- librados::ObjectReadOperation op;
- bufferlist bl;
-- std::uint64_t sz;
-+ uint64_t sz;
- struct timespec tm;
- std::map<std::string, ceph::buffer::list> xattrs;
- std::map<std::string, ceph::buffer::list> omap;
-diff --git a/src/test/mon/test_log_rss_usage.cc b/src/test/mon/test_log_rss_usage.cc
-index f6e85f414c8..9769cabd884 100644
---- a/src/test/mon/test_log_rss_usage.cc
-+++ b/src/test/mon/test_log_rss_usage.cc
-@@ -5,6 +5,7 @@
- #include <string>
- #include <iostream>
- #include <fstream>
-+#include <cstdint>
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch b/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
deleted file mode 100644
index c50cca4e2ca0..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
-index b53b0d9444..5bf5796da2 100644
---- a/src/compressor/zstd/CMakeLists.txt
-+++ b/src/compressor/zstd/CMakeLists.txt
-@@ -1,34 +1,11 @@
- # zstd
-
--# libzstd - build it statically
--set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3")
--
--include(ExternalProject)
--ExternalProject_Add(zstd_ext
-- SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/build/cmake
-- CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-- -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
-- -DCMAKE_AR=${CMAKE_AR}
-- -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED}
-- -G${CMAKE_GENERATOR}
-- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
-- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target libzstd_static
-- BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a"
-- INSTALL_COMMAND "true")
--
--add_library(zstd STATIC IMPORTED)
--set_target_properties(zstd PROPERTIES
-- INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib"
-- IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a")
--add_dependencies(zstd zstd_ext)
--
- set(zstd_sources
- CompressionPluginZstd.cc
- )
-
- add_library(ceph_zstd SHARED ${zstd_sources})
--target_link_libraries(ceph_zstd PRIVATE zstd $<$<PLATFORM_ID:Windows>:ceph-common>)
-+target_link_libraries(ceph_zstd zstd)
- set_target_properties(ceph_zstd PROPERTIES
- VERSION 2.0.0
- SOVERSION 2
diff --git a/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch
deleted file mode 100644
index 79aee882c2a4..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index cd661be16c9..7183c2f2138 100644
---- a/cmake/modules/AddCephTest.cmake
-+++ b/cmake/modules/AddCephTest.cmake
-@@ -55,7 +55,6 @@ endfunction()
-
- function(add_tox_test name)
- set(test_name run-tox-${name})
-- set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv)
- cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN})
- if(DEFINED TOXTEST_TOX_PATH)
- set(tox_path ${TOXTEST_TOX_PATH})
-@@ -68,14 +67,6 @@ function(add_tox_test name)
- list(APPEND tox_envs py3)
- endif()
- string(REPLACE ";" "," tox_envs "${tox_envs}")
-- add_custom_command(
-- OUTPUT ${venv_path}/bin/activate
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path}
-- WORKING_DIRECTORY ${tox_path}
-- COMMENT "preparing venv for ${name}")
-- add_custom_target(${name}-venv
-- DEPENDS ${venv_path}/bin/activate)
-- add_dependencies(tests ${name}-venv)
- add_test(
- NAME ${test_name}
- COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
-diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
-index 9166553dc73..9a6c87595b9 100644
---- a/src/ceph-volume/CMakeLists.txt
-+++ b/src/ceph-volume/CMakeLists.txt
-@@ -8,22 +8,6 @@ if(FREEBSD)
- add_subdirectory(plugin/zfs)
- endif()
-
--# Required for running ceph-volume inventory in a vstart environment
--set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "ceph-volume venv is being created")
--
--add_custom_command(
-- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
-- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
-- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
-- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
--
- add_custom_target(ceph-volume-venv-setup
- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
-
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 0c8d46d65ee..67a618f95aa 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -5,9 +5,6 @@ function(add_npm_command)
- set(multi_kw COMMAND DEPENDS)
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
- string(REPLACE ";" " " command "${NC_COMMAND}")
-- if(NC_NODEENV)
-- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
-- endif()
- string(REPLACE " " ";" command "${command}")
- add_custom_command(
- OUTPUT "${NC_OUTPUT}"
-@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM)
- set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}")
- endif()
- add_custom_command(
-- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=12.18.2
-- COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
-+ OUTPUT "/bin/npm"
-+ COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed"
- )
diff --git a/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch b/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch
deleted file mode 100644
index bef4f6199eb0..000000000000
--- a/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/boost/tools/build/src/tools/features/optimization-feature.jam b/src/boost/tools/build/src/tools/features/optimization-feature.jam
-index 761f76f1..fb2a5dec 100644
---- a/src/boost/tools/build/src/tools/features/optimization-feature.jam
-+++ b/src/boost/tools/build/src/tools/features/optimization-feature.jam
-@@ -8,7 +8,7 @@
- import feature ;
-
- feature.feature optimization
-- : off speed space
-+ : off none speed space
- : propagated ;
-
- feature.feature inlining
diff --git a/sys-cluster/ceph/files/ceph.initd-r13 b/sys-cluster/ceph/files/ceph.initd-r13
deleted file mode 100644
index 2d158ad80be3..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r13
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/openrc-run
-
-# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
-_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
-if [ -r "${_CONFD_FILE}" ]; then
- . "${_CONFD_FILE}" || exit 1
-fi
-
-: "${ceph_conf:=/etc/ceph/ceph.conf}"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: "${rundir:=/run/ceph}"
-: "${user:=ceph}"
-: "${group:=ceph}"
-: "${rc_ulimit:=-n 1048576 -u 1048576}"
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-extra_commands="${extra_commands} reload"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: "${supervisor:=supervise-daemon}"
-: "${stdout:=/var/log/ceph/console/ceph}"
-: "${stderr:=/var/log/ceph/console/ceph}"
-: "${respawn_delay:=10}"
-: "${respawn_max:=5}"
-: "${respawn_period:=1800}"
-
-: "${osd_respawn_delay:=15}"
-: "${osd_respawn_max:=10}"
-
-: "${radosgw_respawn_max:=5}"
-: "${radosgw_respawn_period:=30}"
-
-depend() {
- use dns logger
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd|mgr|radosgw) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- local log_dir
- export CEPH_CONF="${ceph_conf}"
-
- checkpath -d -q -o "${user}:${group}" "${rundir}"
-
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
-
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
- return 1
- fi
-
- if [ -n "${bluestore_osd_fsid}" ]; then
- einfo "Mounting Bluestore"
- ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
- fi
-
- if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
- command_args="${command_args} --name client.${daemon_id}"
- fi
-
- local arg_name arg_val repl_arg_name
- for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
- eval arg_val="\${${daemon_type}_${arg_name}}"
-
- if [ -z "${arg_val}" ]; then
- eval arg_val="\${${arg_name}}"
- else
- eval "${arg_name}=\"${arg_val}\""
- fi
-
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
- local log_file log_postfix
- log_postfix=".${daemon_id}-${arg_name}.log"
- log_file="${arg_val}"
-
- if [ "${log_file}" != /dev/null ]; then
- log_file="${log_file}${log_postfix}"
-
- log_dir="$(dirname "${log_file}")"
- checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
- fi
-
- repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
- supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
- fi
- done
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 "${start_stop_daemon_args}"
- eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 07:37:39 +0000