1 |
commit: e86cc310b44bae35bdcfa01717f3ca9be198be54 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Apr 22 16:04:05 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 23 17:54:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86cc310 |
7 |
|
8 |
sys-cluster/ceph: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/15471 |
13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
14 |
|
15 |
.../ceph/files/ceph-12.2.5-boost-sonames.patch | 165 ----------- |
16 |
.../ceph/files/ceph-13.2.0-boost-sonames.patch | 166 ----------- |
17 |
.../files/ceph-13.2.0-mgr-python-version.patch | 16 - |
18 |
.../ceph/files/ceph-13.2.0-no-virtualenvs.patch | 78 ----- |
19 |
.../ceph/files/ceph-13.2.5-no-automagic-deps.patch | 37 --- |
20 |
.../ceph/files/ceph-13.2.6-dpdk-alignment.patch | 14 - |
21 |
.../ceph/files/ceph-13.2.6-no-virtualenvs.patch | 74 ----- |
22 |
.../ceph/files/ceph-14.2.0-no-virtualenvs.patch | 54 ---- |
23 |
.../ceph-14.2.3-boost-1.6-python-sonames.patch | 26 -- |
24 |
.../ceph/files/ceph-14.2.3-boost-1.70.patch | 78 ----- |
25 |
.../ceph/files/ceph-14.2.3-boost-sonames.patch | 321 --------------------- |
26 |
sys-cluster/ceph/files/ceph.confd-r4 | 70 ----- |
27 |
sys-cluster/ceph/files/ceph.initd-r11 | 115 -------- |
28 |
sys-cluster/ceph/files/ceph.initd-r9 | 97 ------- |
29 |
14 files changed, 1311 deletions(-) |
30 |
|
31 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch |
32 |
deleted file mode 100644 |
33 |
index 57482b3f27c..00000000000 |
34 |
--- a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch |
35 |
+++ /dev/null |
36 |
@@ -1,165 +0,0 @@ |
37 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
38 |
-index aa90ba65da..ea65dd4209 100644 |
39 |
---- a/CMakeLists.txt |
40 |
-+++ b/CMakeLists.txt |
41 |
-@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS |
42 |
- set(BOOST_HEADER_COMPONENTS container) |
43 |
- |
44 |
- if(WITH_MGR) |
45 |
-- list(APPEND BOOST_COMPONENTS python) |
46 |
-+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION}) |
47 |
- endif() |
48 |
- if(WITH_BOOST_CONTEXT) |
49 |
- list(APPEND BOOST_COMPONENTS context coroutine) |
50 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
51 |
-index 7aa8a4392e..111f669f2e 100644 |
52 |
---- a/src/CMakeLists.txt |
53 |
-+++ b/src/CMakeLists.txt |
54 |
-@@ -622,13 +622,13 @@ set(ceph_common_objs |
55 |
- $<TARGET_OBJECTS:crush_objs>) |
56 |
- set(ceph_common_deps |
57 |
- json_spirit erasure_code rt ${LIB_RESOLV} |
58 |
-- Boost::thread |
59 |
-- Boost::system |
60 |
-- Boost::regex |
61 |
-- Boost::random |
62 |
-- Boost::program_options |
63 |
-- Boost::date_time |
64 |
-- Boost::iostreams |
65 |
-+ boost_thread |
66 |
-+ boost_system |
67 |
-+ boost_regex |
68 |
-+ boost_random |
69 |
-+ boost_program_options |
70 |
-+ boost_date_time |
71 |
-+ boost_iostreams |
72 |
- ${BLKID_LIBRARIES} |
73 |
- ${Backtrace_LIBRARIES} |
74 |
- ${BLKIN_LIBRARIES} |
75 |
-@@ -712,7 +712,7 @@ if (WITH_MGR) |
76 |
- $<TARGET_OBJECTS:heap_profiler_objs>) |
77 |
- target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}") |
78 |
- target_link_libraries(ceph-mgr osdc client global-static common |
79 |
-- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
80 |
-+ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
81 |
- install(TARGETS ceph-mgr DESTINATION bin) |
82 |
- endif (WITH_MGR) |
83 |
- |
84 |
-@@ -885,7 +885,7 @@ set(ceph_mds_srcs |
85 |
- ceph_mds.cc) |
86 |
- add_executable(ceph-mds ${ceph_mds_srcs}) |
87 |
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common |
88 |
-- Boost::thread) |
89 |
-+ boost_thread) |
90 |
- install(TARGETS ceph-mds DESTINATION bin) |
91 |
- |
92 |
- add_subdirectory(erasure-code) |
93 |
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt |
94 |
-index f3999e3b01..0ce7fca1ba 100644 |
95 |
---- a/src/test/CMakeLists.txt |
96 |
-+++ b/src/test/CMakeLists.txt |
97 |
-@@ -148,7 +148,7 @@ add_executable(ceph_omapbench |
98 |
- ) |
99 |
- target_link_libraries(ceph_omapbench |
100 |
- librados |
101 |
-- Boost::program_options |
102 |
-+ boost_program_options |
103 |
- global |
104 |
- ${BLKID_LIBRARIES} |
105 |
- ${CMAKE_DL_LIBS} |
106 |
-@@ -202,7 +202,7 @@ if(${WITH_RADOSGW}) |
107 |
- cls_rgw_client |
108 |
- cls_user_client |
109 |
- cls_lock_client |
110 |
-- Boost::regex |
111 |
-+ boost_regex |
112 |
- ${BLKID_LIBRARIES} |
113 |
- ${CURL_LIBRARIES} |
114 |
- ${EXPAT_LIBRARIES} |
115 |
-@@ -232,7 +232,7 @@ if(${WITH_RADOSGW}) |
116 |
- cls_rgw_client |
117 |
- cls_user_client |
118 |
- cls_lock_client |
119 |
-- Boost::regex |
120 |
-+ boost_regex |
121 |
- ${BLKID_LIBRARIES} |
122 |
- ${CURL_LIBRARIES} |
123 |
- ${EXPAT_LIBRARIES} |
124 |
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt |
125 |
-index 9fba701e05..da3cbcfe96 100644 |
126 |
---- a/src/test/bench/CMakeLists.txt |
127 |
-+++ b/src/test/bench/CMakeLists.txt |
128 |
-@@ -8,7 +8,7 @@ set(smalliobench_srcs |
129 |
- add_executable(ceph_smalliobench |
130 |
- ${smalliobench_srcs} |
131 |
- ) |
132 |
--target_link_libraries(ceph_smalliobench librados Boost::program_options global |
133 |
-+target_link_libraries(ceph_smalliobench librados boost_program_options global |
134 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
135 |
- |
136 |
- # ceph_smalliobenchrbd |
137 |
-@@ -27,7 +27,7 @@ if(WITH_RBD) |
138 |
- librados |
139 |
- os |
140 |
- global |
141 |
-- Boost::program_options |
142 |
-+ boost_program_options |
143 |
- ${BLKID_LIBRARIES} |
144 |
- ${CMAKE_DL_LIBS} |
145 |
- ) |
146 |
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs |
147 |
- add_executable(ceph_smalliobenchfs |
148 |
- ${ceph_smalliobenchfs_srcs} |
149 |
- ) |
150 |
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global |
151 |
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global |
152 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
153 |
- |
154 |
- # ceph_smalliobenchdumb |
155 |
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs |
156 |
- add_executable(ceph_smalliobenchdumb |
157 |
- ${smalliobenchdumb_srcs} |
158 |
- ) |
159 |
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global |
160 |
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global |
161 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
162 |
- |
163 |
- # ceph_tpbench |
164 |
-@@ -73,7 +73,7 @@ set(tpbench_srcs |
165 |
- add_executable(ceph_tpbench |
166 |
- ${tpbench_srcs} |
167 |
- ) |
168 |
--target_link_libraries(ceph_tpbench librados Boost::program_options global |
169 |
-+target_link_libraries(ceph_tpbench librados boost_program_options global |
170 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
171 |
- |
172 |
- install(TARGETS |
173 |
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt |
174 |
-index 9f72fa3b48..665c977606 100644 |
175 |
---- a/src/tools/CMakeLists.txt |
176 |
-+++ b/src/tools/CMakeLists.txt |
177 |
-@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global) |
178 |
- install(TARGETS ceph_radosacl DESTINATION bin) |
179 |
- |
180 |
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) |
181 |
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options) |
182 |
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options) |
183 |
- install(TARGETS ceph-osdomap-tool DESTINATION bin) |
184 |
- |
185 |
- add_executable(ceph-monstore-tool |
186 |
- ceph_monstore_tool.cc |
187 |
- ../mgr/mgr_commands.cc) |
188 |
--target_link_libraries(ceph-monstore-tool os global Boost::program_options) |
189 |
-+target_link_libraries(ceph-monstore-tool os global boost_program_options) |
190 |
- install(TARGETS ceph-monstore-tool DESTINATION bin) |
191 |
- install(PROGRAMS |
192 |
- ceph-monstore-update-crush.sh |
193 |
-@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool |
194 |
- ceph_objectstore_tool.cc |
195 |
- rebuild_mondb.cc |
196 |
- RadosDump.cc) |
197 |
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) |
198 |
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) |
199 |
- if(WITH_FUSE) |
200 |
- target_link_libraries(ceph-objectstore-tool fuse) |
201 |
- endif(WITH_FUSE) |
202 |
|
203 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch |
204 |
deleted file mode 100644 |
205 |
index 8de09b91d8a..00000000000 |
206 |
--- a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch |
207 |
+++ /dev/null |
208 |
@@ -1,166 +0,0 @@ |
209 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
210 |
-index 2f997d03f8..748cb190e6 100644 |
211 |
---- a/CMakeLists.txt |
212 |
-+++ b/CMakeLists.txt |
213 |
-@@ -591,7 +591,7 @@ set(BOOST_COMPONENTS |
214 |
- set(BOOST_HEADER_COMPONENTS container) |
215 |
- |
216 |
- if(WITH_MGR) |
217 |
-- list(APPEND BOOST_COMPONENTS python) |
218 |
-+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION}) |
219 |
- endif() |
220 |
- if(WITH_BOOST_CONTEXT) |
221 |
- list(APPEND BOOST_COMPONENTS context coroutine) |
222 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
223 |
-index 3d3b4c0919..94ab42ef9f 100644 |
224 |
---- a/src/CMakeLists.txt |
225 |
-+++ b/src/CMakeLists.txt |
226 |
-@@ -630,12 +630,12 @@ set(ceph_common_objs |
227 |
- $<TARGET_OBJECTS:crush_objs>) |
228 |
- set(ceph_common_deps |
229 |
- json_spirit erasure_code ${LIB_RESOLV} |
230 |
-- Boost::thread |
231 |
-- Boost::system |
232 |
-- Boost::random |
233 |
-- Boost::program_options |
234 |
-- Boost::date_time |
235 |
-- Boost::iostreams |
236 |
-+ boost_thread |
237 |
-+ boost_system |
238 |
-+ boost_random |
239 |
-+ boost_program_options |
240 |
-+ boost_date_time |
241 |
-+ boost_iostreams |
242 |
- ${BLKID_LIBRARIES} |
243 |
- ${Backtrace_LIBRARIES} |
244 |
- ${BLKIN_LIBRARIES} |
245 |
-@@ -759,7 +759,7 @@ if (WITH_MGR) |
246 |
- $<TARGET_OBJECTS:heap_profiler_objs>) |
247 |
- target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") |
248 |
- target_link_libraries(ceph-mgr osdc client global-static ceph-common |
249 |
-- Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
250 |
-+ boost_python-${EPYTHON_VERSION} ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
251 |
- install(TARGETS ceph-mgr DESTINATION bin) |
252 |
- endif (WITH_MGR) |
253 |
- |
254 |
-@@ -888,7 +888,7 @@ set(ceph_mds_srcs |
255 |
- ceph_mds.cc) |
256 |
- add_executable(ceph-mds ${ceph_mds_srcs}) |
257 |
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common |
258 |
-- Boost::thread) |
259 |
-+ boost_thread) |
260 |
- install(TARGETS ceph-mds DESTINATION bin) |
261 |
- |
262 |
- add_subdirectory(erasure-code) |
263 |
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt |
264 |
-index e9d3804c5f..5c6eb58de1 100644 |
265 |
---- a/src/rbd_replay/CMakeLists.txt |
266 |
-+++ b/src/rbd_replay/CMakeLists.txt |
267 |
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) |
268 |
- global |
269 |
- babeltrace |
270 |
- babeltrace-ctf |
271 |
-- Boost::date_time |
272 |
-+ boost_date_time |
273 |
- ) |
274 |
- install(TARGETS rbd-replay-prep DESTINATION bin) |
275 |
- endif(HAVE_BABELTRACE) |
276 |
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt |
277 |
-index c1edd3b882..000c8daaf8 100644 |
278 |
---- a/src/rgw/CMakeLists.txt |
279 |
-+++ b/src/rgw/CMakeLists.txt |
280 |
-@@ -162,7 +162,7 @@ target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_clie |
281 |
- |
282 |
- if (WITH_RADOSGW_BEAST_FRONTEND) |
283 |
- target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING) |
284 |
-- target_link_libraries(rgw_a Boost::coroutine Boost::context) |
285 |
-+ target_link_libraries(rgw_a boost_coroutine boost_context) |
286 |
- endif() |
287 |
- |
288 |
- if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)) |
289 |
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt |
290 |
-index a43335e825..a0d056faaa 100644 |
291 |
---- a/src/test/CMakeLists.txt |
292 |
-+++ b/src/test/CMakeLists.txt |
293 |
-@@ -147,7 +147,7 @@ add_executable(ceph_omapbench |
294 |
- ) |
295 |
- target_link_libraries(ceph_omapbench |
296 |
- librados |
297 |
-- Boost::program_options |
298 |
-+ boost_program_options |
299 |
- global |
300 |
- ${BLKID_LIBRARIES} |
301 |
- ${CMAKE_DL_LIBS} |
302 |
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt |
303 |
-index 4ba31ab2a8..ab66208b57 100644 |
304 |
---- a/src/test/erasure-code/CMakeLists.txt |
305 |
-+++ b/src/test/erasure-code/CMakeLists.txt |
306 |
-@@ -2,15 +2,15 @@ |
307 |
- add_executable(ceph_erasure_code_benchmark |
308 |
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc |
309 |
- ceph_erasure_code_benchmark.cc) |
310 |
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
311 |
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
312 |
- install(TARGETS ceph_erasure_code_benchmark |
313 |
- DESTINATION bin) |
314 |
- |
315 |
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) |
316 |
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
317 |
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
318 |
- |
319 |
- add_executable(ceph_erasure_code ceph_erasure_code.cc) |
320 |
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
321 |
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
322 |
- install(TARGETS ceph_erasure_code |
323 |
- DESTINATION bin) |
324 |
- |
325 |
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt |
326 |
-index 1c909ee1ce..7c1ef32df1 100644 |
327 |
---- a/src/test/librados/CMakeLists.txt |
328 |
-+++ b/src/test/librados/CMakeLists.txt |
329 |
-@@ -61,7 +61,7 @@ set_target_properties(ceph_test_rados_api_asio PROPERTIES COMPILE_FLAGS |
330 |
- target_link_libraries(ceph_test_rados_api_asio global |
331 |
- librados ${UNITTEST_LIBS}) |
332 |
- if(WITH_BOOST_CONTEXT) |
333 |
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) |
334 |
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) |
335 |
- endif() |
336 |
- |
337 |
- # ceph_test_rados_api_list |
338 |
-@@ -147,7 +147,7 @@ add_executable(ceph_test_rados_api_tier |
339 |
- set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS |
340 |
- ${UNITTEST_CXX_FLAGS}) |
341 |
- target_link_libraries(ceph_test_rados_api_tier |
342 |
-- librados global ${UNITTEST_LIBS} Boost::system radostest) |
343 |
-+ librados global ${UNITTEST_LIBS} boost_system radostest) |
344 |
- |
345 |
- # ceph_test_rados_api_snapshots |
346 |
- add_executable(ceph_test_rados_api_snapshots |
347 |
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt |
348 |
-index e0844ec0c7..886839302c 100644 |
349 |
---- a/src/tools/CMakeLists.txt |
350 |
-+++ b/src/tools/CMakeLists.txt |
351 |
-@@ -29,20 +29,20 @@ install(PROGRAMS |
352 |
- endif(WITH_TESTS) |
353 |
- |
354 |
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) |
355 |
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options) |
356 |
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options) |
357 |
- install(TARGETS ceph-osdomap-tool DESTINATION bin) |
358 |
- |
359 |
- add_executable(ceph-monstore-tool |
360 |
- ceph_monstore_tool.cc |
361 |
- ../mgr/mgr_commands.cc) |
362 |
--target_link_libraries(ceph-monstore-tool os global Boost::program_options) |
363 |
-+target_link_libraries(ceph-monstore-tool os global boost_program_options) |
364 |
- install(TARGETS ceph-monstore-tool DESTINATION bin) |
365 |
- |
366 |
- add_executable(ceph-objectstore-tool |
367 |
- ceph_objectstore_tool.cc |
368 |
- rebuild_mondb.cc |
369 |
- RadosDump.cc) |
370 |
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) |
371 |
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) |
372 |
- if(WITH_FUSE) |
373 |
- target_link_libraries(ceph-objectstore-tool fuse) |
374 |
- endif(WITH_FUSE) |
375 |
|
376 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch b/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch |
377 |
deleted file mode 100644 |
378 |
index 0dc90ebeaef..00000000000 |
379 |
--- a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch |
380 |
+++ /dev/null |
381 |
@@ -1,16 +0,0 @@ |
382 |
-diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt |
383 |
-index c996cd9402..f99765702b 100644 |
384 |
---- a/src/pybind/CMakeLists.txt |
385 |
-+++ b/src/pybind/CMakeLists.txt |
386 |
-@@ -62,11 +62,6 @@ foreach(python_version ${py_vers}) |
387 |
- endforeach() |
388 |
- |
389 |
- if(WITH_MGR) |
390 |
-- if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2) |
391 |
-- message(FATAL_ERROR "mgr plugins require python2 binding") |
392 |
-- elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3) |
393 |
-- message(FATAL_ERROR "mgr plugins require python3 binding") |
394 |
-- endif() |
395 |
- # Location needs to match default setting for mgr_module_path, currently: |
396 |
- # OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr") |
397 |
- install(DIRECTORY |
398 |
|
399 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch |
400 |
deleted file mode 100644 |
401 |
index 470dbaeb3c0..00000000000 |
402 |
--- a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch |
403 |
+++ /dev/null |
404 |
@@ -1,78 +0,0 @@ |
405 |
-diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt |
406 |
-index 6e5946b784..233cccfc9b 100644 |
407 |
---- a/src/ceph-detect-init/CMakeLists.txt |
408 |
-+++ b/src/ceph-detect-init/CMakeLists.txt |
409 |
-@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua |
410 |
- |
411 |
- add_custom_target(ceph-detect-init |
412 |
- COMMAND |
413 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && |
414 |
-- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . |
415 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && |
416 |
-+ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . |
417 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init |
418 |
- COMMENT "ceph-detect-init is being created") |
419 |
- add_dependencies(tests ceph-detect-init) |
420 |
-diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt |
421 |
-index 00aaec4a80..b0700c488f 100644 |
422 |
---- a/src/ceph-disk/CMakeLists.txt |
423 |
-+++ b/src/ceph-disk/CMakeLists.txt |
424 |
-@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv) |
425 |
- |
426 |
- add_custom_target(ceph-disk |
427 |
- COMMAND |
428 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && |
429 |
-- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . |
430 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && |
431 |
-+ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . |
432 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk |
433 |
- COMMENT "ceph-disk is being created") |
434 |
- add_dependencies(tests ceph-disk) |
435 |
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt |
436 |
-index 2b050f6c6e..e9fb87f76b 100644 |
437 |
---- a/src/pybind/mgr/dashboard/CMakeLists.txt |
438 |
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt |
439 |
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) |
440 |
- |
441 |
- add_custom_target(mgr-dashboard-test-venv |
442 |
- COMMAND |
443 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
444 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
445 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard |
446 |
- COMMENT "dashboard tests virtualenv is being created") |
447 |
- add_dependencies(tests mgr-dashboard-test-venv) |
448 |
-@@ -13,9 +13,9 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env) |
449 |
- |
450 |
- add_custom_command( |
451 |
- OUTPUT "${mgr-dashboard-nodeenv}/bin/npm" |
452 |
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv} |
453 |
-- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv |
454 |
-- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0 |
455 |
-+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv} |
456 |
-+ #COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv |
457 |
-+ #COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0 |
458 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
459 |
- COMMENT "dashboard nodeenv is being installed" |
460 |
- ) |
461 |
-@@ -27,7 +27,7 @@ add_custom_target(mgr-dashboard-nodeenv |
462 |
- |
463 |
- add_custom_command( |
464 |
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules" |
465 |
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate |
466 |
-+ #COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate |
467 |
- DEPENDS frontend/package.json |
468 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend |
469 |
- COMMENT "dashboard frontend dependencies are being installed" |
470 |
-@@ -62,9 +62,11 @@ else() |
471 |
- set(npm_command npm run build) |
472 |
- endif() |
473 |
- |
474 |
-+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin) |
475 |
-+ |
476 |
- add_custom_command( |
477 |
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist" |
478 |
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate |
479 |
-+ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command} |
480 |
- DEPENDS ${frontend_src} frontend/node_modules |
481 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend |
482 |
- COMMENT "dashboard frontend is being created" |
483 |
|
484 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch b/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch |
485 |
deleted file mode 100644 |
486 |
index 1eb42b3e5ad..00000000000 |
487 |
--- a/sys-cluster/ceph/files/ceph-13.2.5-no-automagic-deps.patch |
488 |
+++ /dev/null |
489 |
@@ -1,37 +0,0 @@ |
490 |
---- ceph-13.2.5.orig/src/rocksdb/CMakeLists.txt 2019-03-20 11:39:25.065954652 -0700 |
491 |
-+++ ceph-13.2.5/src/rocksdb/CMakeLists.txt 2019-03-20 13:18:01.548085828 -0700 |
492 |
-@@ -286,18 +286,24 @@ |
493 |
- endif() |
494 |
- endif() |
495 |
- |
496 |
--find_package(NUMA) |
497 |
--if(NUMA_FOUND) |
498 |
-- add_definitions(-DNUMA) |
499 |
-- include_directories(${NUMA_INCLUDE_DIR}) |
500 |
-- list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES}) |
501 |
-+option(WITH_NUMA "build with UBSAN" OFF) |
502 |
-+if(WITH_NUMA) |
503 |
-+ find_package(NUMA) |
504 |
-+ if(NUMA_FOUND) |
505 |
-+ add_definitions(-DNUMA) |
506 |
-+ include_directories(${NUMA_INCLUDE_DIR}) |
507 |
-+ list(APPEND THIRDPARTY_LIBS ${NUMA_LIBRARIES}) |
508 |
-+ endif() |
509 |
- endif() |
510 |
- |
511 |
--find_package(TBB) |
512 |
--if(TBB_FOUND) |
513 |
-- add_definitions(-DTBB) |
514 |
-- include_directories(${TBB_INCLUDE_DIR}) |
515 |
-- list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES}) |
516 |
-+option(WITH_TBB "build with UBSAN" OFF) |
517 |
-+if(WITH_TBB) |
518 |
-+ find_package(TBB) |
519 |
-+ if(TBB_FOUND) |
520 |
-+ add_definitions(-DTBB) |
521 |
-+ include_directories(${TBB_INCLUDE_DIR}) |
522 |
-+ list(APPEND THIRDPARTY_LIBS ${TBB_LIBRARIES}) |
523 |
-+ endif() |
524 |
- endif() |
525 |
- |
526 |
- # Used to run CI build and tests so we can run faster |
527 |
|
528 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch b/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch |
529 |
deleted file mode 100644 |
530 |
index c5d048eb7a2..00000000000 |
531 |
--- a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch |
532 |
+++ /dev/null |
533 |
@@ -1,14 +0,0 @@ |
534 |
-diff --git a/src/spdk/dpdk/lib/librte_net/rte_ether.h b/src/spdk/dpdk/lib/librte_net/rte_ether.h |
535 |
-index 3a87ff184..8090b7c01 100644 |
536 |
---- a/src/spdk/dpdk/lib/librte_net/rte_ether.h |
537 |
-+++ b/src/spdk/dpdk/lib/librte_net/rte_ether.h |
538 |
-@@ -55,7 +55,8 @@ extern "C" { |
539 |
- * See http://standards.ieee.org/regauth/groupmac/tutorial.html |
540 |
- */ |
541 |
- struct ether_addr { |
542 |
-- uint8_t addr_bytes[ETHER_ADDR_LEN]; /**< Addr bytes in tx order */ |
543 |
-+ /** Addr bytes in tx order */ |
544 |
-+ uint8_t addr_bytes[ETHER_ADDR_LEN] __rte_aligned(2); |
545 |
- } __attribute__((__packed__)); |
546 |
- |
547 |
- #define ETHER_LOCAL_ADMIN_ADDR 0x02 /**< Locally assigned Eth. address. */ |
548 |
|
549 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch |
550 |
deleted file mode 100644 |
551 |
index ad38799b690..00000000000 |
552 |
--- a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch |
553 |
+++ /dev/null |
554 |
@@ -1,74 +0,0 @@ |
555 |
-diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt |
556 |
-index 6e5946b784..233cccfc9b 100644 |
557 |
---- a/src/ceph-detect-init/CMakeLists.txt |
558 |
-+++ b/src/ceph-detect-init/CMakeLists.txt |
559 |
-@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua |
560 |
- |
561 |
- add_custom_target(ceph-detect-init |
562 |
- COMMAND |
563 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && |
564 |
-- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . |
565 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && |
566 |
-+ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . |
567 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init |
568 |
- COMMENT "ceph-detect-init is being created") |
569 |
- add_dependencies(tests ceph-detect-init) |
570 |
-diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt |
571 |
-index 00aaec4a80..b0700c488f 100644 |
572 |
---- a/src/ceph-disk/CMakeLists.txt |
573 |
-+++ b/src/ceph-disk/CMakeLists.txt |
574 |
-@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv) |
575 |
- |
576 |
- add_custom_target(ceph-disk |
577 |
- COMMAND |
578 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && |
579 |
-- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . |
580 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && |
581 |
-+ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . |
582 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk |
583 |
- COMMENT "ceph-disk is being created") |
584 |
- add_dependencies(tests ceph-disk) |
585 |
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt |
586 |
-index 88ca8a60bb..77c716cdb1 100644 |
587 |
---- a/src/pybind/mgr/dashboard/CMakeLists.txt |
588 |
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt |
589 |
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) |
590 |
- |
591 |
- add_custom_target(mgr-dashboard-test-venv |
592 |
- COMMAND |
593 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
594 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
595 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard |
596 |
- COMMENT "dashboard tests virtualenv is being created") |
597 |
- add_dependencies(tests mgr-dashboard-test-venv) |
598 |
-@@ -13,9 +13,6 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env) |
599 |
- |
600 |
- add_custom_command( |
601 |
- OUTPUT "${mgr-dashboard-nodeenv}/bin/npm" |
602 |
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv} |
603 |
-- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv |
604 |
-- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 10.13.0 |
605 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
606 |
- COMMENT "dashboard nodeenv is being installed" |
607 |
- ) |
608 |
-@@ -27,7 +24,6 @@ add_custom_target(mgr-dashboard-nodeenv |
609 |
- |
610 |
- add_custom_command( |
611 |
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules" |
612 |
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm ci && deactivate |
613 |
- DEPENDS frontend/package.json |
614 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend |
615 |
- COMMENT "dashboard frontend dependencies are being installed" |
616 |
-@@ -62,9 +58,11 @@ else() |
617 |
- set(npm_command npm run build) |
618 |
- endif() |
619 |
- |
620 |
-+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin) |
621 |
-+ |
622 |
- add_custom_command( |
623 |
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist" |
624 |
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate |
625 |
-+ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command} |
626 |
- DEPENDS ${frontend_src} frontend/node_modules |
627 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend |
628 |
- COMMENT "dashboard frontend is being created" |
629 |
|
630 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch |
631 |
deleted file mode 100644 |
632 |
index 5647ac51674..00000000000 |
633 |
--- a/sys-cluster/ceph/files/ceph-14.2.0-no-virtualenvs.patch |
634 |
+++ /dev/null |
635 |
@@ -1,54 +0,0 @@ |
636 |
-diff --git a/.gitignore b/.gitignore |
637 |
-index 2c2afc282e..80c05ee2f0 100644 |
638 |
---- a/.gitignore |
639 |
-+++ b/.gitignore |
640 |
-@@ -13,10 +13,8 @@ |
641 |
- *.swp |
642 |
- *.swo |
643 |
- *.tmp |
644 |
--*.orig |
645 |
- *.patch |
646 |
- !debian/patches/*.patch |
647 |
--*.rej |
648 |
- *.rpm |
649 |
- *.pyc |
650 |
- ceph.spec |
651 |
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt |
652 |
-index 24a2efc9e2..b11d4d0303 100644 |
653 |
---- a/src/pybind/mgr/dashboard/CMakeLists.txt |
654 |
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt |
655 |
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) |
656 |
- |
657 |
- add_custom_target(mgr-dashboard-test-venv |
658 |
- COMMAND |
659 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
660 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
661 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard |
662 |
- COMMENT "dashboard tests virtualenv is being created") |
663 |
- add_dependencies(tests mgr-dashboard-test-venv) |
664 |
-@@ -14,9 +14,9 @@ function(add_npm_command) |
665 |
- set(multi_kw COMMAND DEPENDS) |
666 |
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) |
667 |
- string(REPLACE ";" " " command "${NC_COMMAND}") |
668 |
-- if(NC_NODEENV) |
669 |
-- string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) |
670 |
-- endif() |
671 |
-+ #if(NC_NODEENV) |
672 |
-+ # string(REGEX REPLACE "^(npm .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) |
673 |
-+ #endif() |
674 |
- string(REPLACE " " ";" command "${command}") |
675 |
- add_custom_command( |
676 |
- OUTPUT "${NC_OUTPUT}" |
677 |
-@@ -41,9 +41,9 @@ else() |
678 |
- |
679 |
- add_custom_command( |
680 |
- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" |
681 |
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} |
682 |
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv |
683 |
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0 |
684 |
-+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} |
685 |
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv |
686 |
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0 |
687 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
688 |
- COMMENT "dashboard nodeenv is being installed" |
689 |
- ) |
690 |
|
691 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch |
692 |
deleted file mode 100644 |
693 |
index 860bd9624e8..00000000000 |
694 |
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch |
695 |
+++ /dev/null |
696 |
@@ -1,26 +0,0 @@ |
697 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
698 |
-index 05d1e61270..8b939b8af6 100644 |
699 |
---- a/CMakeLists.txt |
700 |
-+++ b/CMakeLists.txt |
701 |
-@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container) |
702 |
- |
703 |
- if(WITH_MGR) |
704 |
- list(APPEND BOOST_COMPONENTS |
705 |
-- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}) |
706 |
-+ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR}) |
707 |
- endif() |
708 |
- if(WITH_BOOST_CONTEXT) |
709 |
- list(APPEND BOOST_COMPONENTS context coroutine) |
710 |
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake |
711 |
-index f46cc0d485..3cc6340b2c 100644 |
712 |
---- a/cmake/modules/BuildBoost.cmake |
713 |
-+++ b/cmake/modules/BuildBoost.cmake |
714 |
-@@ -205,7 +205,7 @@ macro(build_boost version) |
715 |
- endif() |
716 |
- add_dependencies(Boost::${c} Boost) |
717 |
- if(c MATCHES "^python") |
718 |
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") |
719 |
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") |
720 |
- endif() |
721 |
- if(Boost_USE_STATIC_LIBS) |
722 |
- set(Boost_${upper_c}_LIBRARY |
723 |
|
724 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch |
725 |
deleted file mode 100644 |
726 |
index 26cea1e394b..00000000000 |
727 |
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch |
728 |
+++ /dev/null |
729 |
@@ -1,78 +0,0 @@ |
730 |
-diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc |
731 |
-index e4be074ec7..4af3695dc1 100644 |
732 |
---- a/src/rgw/rgw_asio_frontend.cc |
733 |
-+++ b/src/rgw/rgw_asio_frontend.cc |
734 |
-@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO { |
735 |
- using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>; |
736 |
- |
737 |
- template <typename Stream> |
738 |
--void handle_connection(RGWProcessEnv& env, Stream& stream, |
739 |
-+void handle_connection(boost::asio::io_context& context, |
740 |
-+ RGWProcessEnv& env, Stream& stream, |
741 |
- boost::beast::flat_buffer& buffer, bool is_ssl, |
742 |
- SharedMutex& pause_mutex, |
743 |
- rgw::dmclock::Scheduler *scheduler, |
744 |
-@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream, |
745 |
- rgw::io::add_conlen_controlling( |
746 |
- &real_client)))); |
747 |
- RGWRestfulIO client(cct, &real_client_io); |
748 |
-- auto y = optional_yield{socket.get_io_context(), yield}; |
749 |
-+ auto y = optional_yield{context, yield}; |
750 |
- process_request(env.store, env.rest, &req, env.uri_prefix, |
751 |
- *env.auth_registry, &client, env.olog, y, scheduler); |
752 |
- } |
753 |
-@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) |
754 |
- return; |
755 |
- } |
756 |
- buffer.consume(bytes); |
757 |
-- handle_connection(env, stream, buffer, true, pause_mutex, |
758 |
-+ handle_connection(context, env, stream, buffer, true, pause_mutex, |
759 |
- scheduler.get(), ec, yield); |
760 |
- if (!ec) { |
761 |
- // ssl shutdown (ignoring errors) |
762 |
-@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) |
763 |
- auto c = connections.add(conn); |
764 |
- boost::beast::flat_buffer buffer; |
765 |
- boost::system::error_code ec; |
766 |
-- handle_connection(env, s, buffer, false, pause_mutex, |
767 |
-+ handle_connection(context, env, s, buffer, false, pause_mutex, |
768 |
- scheduler.get(), ec, yield); |
769 |
- s.shutdown(tcp::socket::shutdown_both, ec); |
770 |
- }); |
771 |
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h |
772 |
-index 70487a5253..1d454acd2e 100644 |
773 |
---- a/src/rgw/rgw_dmclock_async_scheduler.h |
774 |
-+++ b/src/rgw/rgw_dmclock_async_scheduler.h |
775 |
-@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler { |
776 |
- using Completion = async::Completion<Signature, async::AsBase<Request>>; |
777 |
- |
778 |
- using Clock = ceph::coarse_real_clock; |
779 |
-+#if BOOST_VERSION < 107000 |
780 |
- using Timer = boost::asio::basic_waitable_timer<Clock>; |
781 |
-+#else |
782 |
-+ using Timer = boost::asio::basic_waitable_timer<Clock, |
783 |
-+ boost::asio::wait_traits<Clock>, executor_type>; |
784 |
-+#endif |
785 |
- Timer timer; //< timer for the next scheduled request |
786 |
- |
787 |
- CephContext *const cct; |
788 |
-diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h |
789 |
-index d99a6ff68d..213fc238d2 100644 |
790 |
---- a/src/rgw/rgw_reshard.h |
791 |
-+++ b/src/rgw/rgw_reshard.h |
792 |
-@@ -183,7 +183,14 @@ class RGWReshardWait { |
793 |
- ceph::condition_variable cond; |
794 |
- |
795 |
- struct Waiter : boost::intrusive::list_base_hook<> { |
796 |
-- boost::asio::basic_waitable_timer<Clock> timer; |
797 |
-+#if BOOST_VERSION < 107000 |
798 |
-+ using Timer = boost::asio::basic_waitable_timer<Clock>; |
799 |
-+#else |
800 |
-+ using Executor = boost::asio::io_context::executor_type; |
801 |
-+ using Timer = boost::asio::basic_waitable_timer<Clock, |
802 |
-+ boost::asio::wait_traits<Clock>, Executor>; |
803 |
-+#endif |
804 |
-+ Timer timer; |
805 |
- explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {} |
806 |
- }; |
807 |
- boost::intrusive::list<Waiter> waiters; |
808 |
|
809 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch |
810 |
deleted file mode 100644 |
811 |
index 92ca32f5c8e..00000000000 |
812 |
--- a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch |
813 |
+++ /dev/null |
814 |
@@ -1,321 +0,0 @@ |
815 |
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake |
816 |
-index dd08ba5e45..19d3b8ad37 100644 |
817 |
---- a/cmake/modules/FindBoost.cmake |
818 |
-+++ b/cmake/modules/FindBoost.cmake |
819 |
-@@ -1235,10 +1235,10 @@ endif() |
820 |
- # on all platforms to keep end user code free from platform dependent |
821 |
- # code. Also provide convenience targets to disable autolinking and |
822 |
- # enable dynamic linking. |
823 |
--if(NOT TARGET Boost::diagnostic_definitions) |
824 |
-- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) |
825 |
-- add_library(Boost::disable_autolinking INTERFACE IMPORTED) |
826 |
-- add_library(Boost::dynamic_linking INTERFACE IMPORTED) |
827 |
-+if(NOT TARGET boost_diagnostic_definitions) |
828 |
-+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED) |
829 |
-+ add_library(boost_disable_autolinking INTERFACE IMPORTED) |
830 |
-+ add_library(boost_dynamic_linking INTERFACE IMPORTED) |
831 |
- endif() |
832 |
- if(WIN32) |
833 |
- # In windows, automatic linking is performed, so you do not have |
834 |
-@@ -1259,11 +1259,11 @@ if(WIN32) |
835 |
- # code to emit a #pragma message each time a library is selected |
836 |
- # for linking. |
837 |
- set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") |
838 |
-- set_target_properties(Boost::diagnostic_definitions PROPERTIES |
839 |
-+ set_target_properties(boost_diagnostic_definitions PROPERTIES |
840 |
- INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") |
841 |
-- set_target_properties(Boost::disable_autolinking PROPERTIES |
842 |
-+ set_target_properties(boost_disable_autolinking PROPERTIES |
843 |
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") |
844 |
-- set_target_properties(Boost::dynamic_linking PROPERTIES |
845 |
-+ set_target_properties(boost_dynamic_linking PROPERTIES |
846 |
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") |
847 |
- endif() |
848 |
- |
849 |
-@@ -2088,52 +2088,52 @@ if(Boost_FOUND) |
850 |
- endif() |
851 |
- |
852 |
- foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
853 |
-- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) |
854 |
-+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT}) |
855 |
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT) |
856 |
- if(Boost_${UPPERCOMPONENT}_FOUND) |
857 |
- if(Boost_USE_STATIC_LIBS) |
858 |
-- add_library(Boost::${COMPONENT} STATIC IMPORTED) |
859 |
-+ add_library(boost_${COMPONENT} STATIC IMPORTED) |
860 |
- else() |
861 |
- # Even if Boost_USE_STATIC_LIBS is OFF, we might have static |
862 |
- # libraries as a result. |
863 |
-- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) |
864 |
-+ add_library(boost_${COMPONENT} UNKNOWN IMPORTED) |
865 |
- endif() |
866 |
- if(Boost_INCLUDE_DIRS) |
867 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
868 |
-+ set_target_properties(boost_${COMPONENT} PROPERTIES |
869 |
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") |
870 |
- endif() |
871 |
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}") |
872 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
873 |
-+ set_target_properties(boost_${COMPONENT} PROPERTIES |
874 |
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" |
875 |
- IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") |
876 |
- endif() |
877 |
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") |
878 |
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY |
879 |
-+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY |
880 |
- IMPORTED_CONFIGURATIONS RELEASE) |
881 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
882 |
-+ set_target_properties(boost_${COMPONENT} PROPERTIES |
883 |
- IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" |
884 |
- IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") |
885 |
- endif() |
886 |
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") |
887 |
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY |
888 |
-+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY |
889 |
- IMPORTED_CONFIGURATIONS DEBUG) |
890 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
891 |
-+ set_target_properties(boost_${COMPONENT} PROPERTIES |
892 |
- IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" |
893 |
- IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") |
894 |
- endif() |
895 |
- if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) |
896 |
- unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) |
897 |
- foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES}) |
898 |
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep}) |
899 |
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep}) |
900 |
- endforeach() |
901 |
- if(COMPONENT STREQUAL "thread") |
902 |
- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads) |
903 |
- endif() |
904 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
905 |
-+ set_target_properties(boost_${COMPONENT} PROPERTIES |
906 |
- INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}") |
907 |
- endif() |
908 |
- if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES) |
909 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
910 |
-+ set_target_properties(boost_${COMPONENT} PROPERTIES |
911 |
- INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}") |
912 |
- endif() |
913 |
- endif() |
914 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
915 |
-index 4895e84df6..55814e3b96 100644 |
916 |
---- a/src/CMakeLists.txt |
917 |
-+++ b/src/CMakeLists.txt |
918 |
-@@ -356,12 +356,12 @@ set(ceph_common_objs |
919 |
- set(ceph_common_deps |
920 |
- json_spirit erasure_code arch crc32 |
921 |
- ${LIB_RESOLV} |
922 |
-- Boost::thread |
923 |
-- Boost::system |
924 |
-- Boost::random |
925 |
-- Boost::program_options |
926 |
-- Boost::date_time |
927 |
-- Boost::iostreams |
928 |
-+ boost_thread |
929 |
-+ boost_system |
930 |
-+ boost_random |
931 |
-+ boost_program_options |
932 |
-+ boost_date_time |
933 |
-+ boost_iostreams |
934 |
- ${BLKID_LIBRARIES} |
935 |
- ${Backtrace_LIBRARIES} |
936 |
- ${BLKIN_LIBRARIES} |
937 |
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS) |
938 |
- ceph_mds.cc) |
939 |
- add_executable(ceph-mds ${ceph_mds_srcs}) |
940 |
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common |
941 |
-- Boost::thread) |
942 |
-+ boost_thread) |
943 |
- install(TARGETS ceph-mds DESTINATION bin) |
944 |
- endif() |
945 |
- |
946 |
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt |
947 |
-index d7b58521d4..e1533af33f 100644 |
948 |
---- a/src/crimson/CMakeLists.txt |
949 |
-+++ b/src/crimson/CMakeLists.txt |
950 |
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common |
951 |
- PRIVATE |
952 |
- crc32 |
953 |
- crimson::cflags |
954 |
-- Boost::iostreams |
955 |
-- Boost::random |
956 |
-+ boost_iostreams |
957 |
-+ boost_random |
958 |
- ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto) |
959 |
- |
960 |
- set(crimson_auth_srcs |
961 |
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt |
962 |
-index 252fb3e5e3..213482da16 100644 |
963 |
---- a/src/mgr/CMakeLists.txt |
964 |
-+++ b/src/mgr/CMakeLists.txt |
965 |
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") |
966 |
- target_link_libraries(ceph-mgr |
967 |
- osdc client heap_profiler |
968 |
- global-static ceph-common |
969 |
-- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} |
970 |
-+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} |
971 |
- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) |
972 |
- set_target_properties(ceph-mgr PROPERTIES |
973 |
- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) |
974 |
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt |
975 |
-index e9d3804c5f..5c6eb58de1 100644 |
976 |
---- a/src/rbd_replay/CMakeLists.txt |
977 |
-+++ b/src/rbd_replay/CMakeLists.txt |
978 |
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) |
979 |
- global |
980 |
- babeltrace |
981 |
- babeltrace-ctf |
982 |
-- Boost::date_time |
983 |
-+ boost_date_time |
984 |
- ) |
985 |
- install(TARGETS rbd-replay-prep DESTINATION bin) |
986 |
- endif(HAVE_BABELTRACE) |
987 |
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt |
988 |
-index 8d5b0638a0..a147c55bc3 100644 |
989 |
---- a/src/rgw/CMakeLists.txt |
990 |
-+++ b/src/rgw/CMakeLists.txt |
991 |
-@@ -196,7 +196,7 @@ if(WITH_CURL_OPENSSL) |
992 |
- endif() |
993 |
- |
994 |
- if(WITH_BOOST_CONTEXT) |
995 |
-- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) |
996 |
-+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context) |
997 |
- endif() |
998 |
- |
999 |
- set(rgw_libs rgw_a) |
1000 |
-@@ -347,7 +347,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT) |
1001 |
- target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ) |
1002 |
- endif() |
1003 |
- if(WITH_BOOST_CONTEXT) |
1004 |
-- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) |
1005 |
-+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context) |
1006 |
- endif() |
1007 |
- |
1008 |
- if(WITH_TESTS) |
1009 |
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt |
1010 |
-index 5dcee1694d..60743be698 100644 |
1011 |
---- a/src/test/CMakeLists.txt |
1012 |
-+++ b/src/test/CMakeLists.txt |
1013 |
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench |
1014 |
- ) |
1015 |
- target_link_libraries(ceph_omapbench |
1016 |
- librados |
1017 |
-- Boost::program_options |
1018 |
-+ boost_program_options |
1019 |
- global |
1020 |
- ${BLKID_LIBRARIES} |
1021 |
- ${CMAKE_DL_LIBS} |
1022 |
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt |
1023 |
-index 71fb77cda9..aff8fb6565 100644 |
1024 |
---- a/src/test/common/CMakeLists.txt |
1025 |
-+++ b/src/test/common/CMakeLists.txt |
1026 |
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject) |
1027 |
- |
1028 |
- add_executable(unittest_async_completion test_async_completion.cc) |
1029 |
- add_ceph_unittest(unittest_async_completion) |
1030 |
--target_link_libraries(unittest_async_completion Boost::system) |
1031 |
-+target_link_libraries(unittest_async_completion boost_system) |
1032 |
- |
1033 |
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) |
1034 |
- add_ceph_unittest(unittest_async_shared_mutex) |
1035 |
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) |
1036 |
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system) |
1037 |
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt |
1038 |
-index 721f6c3675..1cd9635c77 100644 |
1039 |
---- a/src/test/erasure-code/CMakeLists.txt |
1040 |
-+++ b/src/test/erasure-code/CMakeLists.txt |
1041 |
-@@ -2,15 +2,15 @@ |
1042 |
- add_executable(ceph_erasure_code_benchmark |
1043 |
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc |
1044 |
- ceph_erasure_code_benchmark.cc) |
1045 |
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
1046 |
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
1047 |
- install(TARGETS ceph_erasure_code_benchmark |
1048 |
- DESTINATION bin) |
1049 |
- |
1050 |
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) |
1051 |
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
1052 |
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
1053 |
- |
1054 |
- add_executable(ceph_erasure_code ceph_erasure_code.cc) |
1055 |
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
1056 |
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
1057 |
- install(TARGETS ceph_erasure_code |
1058 |
- DESTINATION bin) |
1059 |
- |
1060 |
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt |
1061 |
-index 4fc53d2406..e6304394f8 100644 |
1062 |
---- a/src/test/librados/CMakeLists.txt |
1063 |
-+++ b/src/test/librados/CMakeLists.txt |
1064 |
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc) |
1065 |
- target_link_libraries(ceph_test_rados_api_asio global |
1066 |
- librados ${UNITTEST_LIBS}) |
1067 |
- if(WITH_BOOST_CONTEXT) |
1068 |
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) |
1069 |
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) |
1070 |
- endif() |
1071 |
- |
1072 |
- add_executable(ceph_test_rados_api_list |
1073 |
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp |
1074 |
- tier_cxx.cc |
1075 |
- $<TARGET_OBJECTS:unit-main>) |
1076 |
- target_link_libraries(ceph_test_rados_api_tier_pp |
1077 |
-- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) |
1078 |
-+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx) |
1079 |
- |
1080 |
- add_executable(ceph_test_rados_api_snapshots |
1081 |
- snapshots.cc) |
1082 |
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt |
1083 |
-index 3988e94bd3..b2a720b8a0 100644 |
1084 |
---- a/src/test/librbd/CMakeLists.txt |
1085 |
-+++ b/src/test/librbd/CMakeLists.txt |
1086 |
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE |
1087 |
- radostest |
1088 |
- radostest-cxx |
1089 |
- librados |
1090 |
-- Boost::thread |
1091 |
-+ boost_thread |
1092 |
- GMock::GMock |
1093 |
- GTest::GTest) |
1094 |
- |
1095 |
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt |
1096 |
-index 36df883a66..43d3456089 100644 |
1097 |
---- a/src/test/rgw/CMakeLists.txt |
1098 |
-+++ b/src/test/rgw/CMakeLists.txt |
1099 |
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler) |
1100 |
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock) |
1101 |
- if(WITH_BOOST_CONTEXT) |
1102 |
- target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) |
1103 |
-- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) |
1104 |
-+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context) |
1105 |
- endif() |
1106 |
- |
1107 |
- if(WITH_RADOSGW_AMQP_ENDPOINT) |
1108 |
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt |
1109 |
-index d31f3d2408..6945018b11 100644 |
1110 |
---- a/src/tools/CMakeLists.txt |
1111 |
-+++ b/src/tools/CMakeLists.txt |
1112 |
-@@ -35,20 +35,20 @@ install(PROGRAMS |
1113 |
- endif(WITH_TESTS) |
1114 |
- |
1115 |
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) |
1116 |
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options) |
1117 |
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options) |
1118 |
- install(TARGETS ceph-osdomap-tool DESTINATION bin) |
1119 |
- |
1120 |
- add_executable(ceph-monstore-tool |
1121 |
- ceph_monstore_tool.cc |
1122 |
- ../mgr/mgr_commands.cc) |
1123 |
--target_link_libraries(ceph-monstore-tool os global Boost::program_options) |
1124 |
-+target_link_libraries(ceph-monstore-tool os global boost_program_options) |
1125 |
- install(TARGETS ceph-monstore-tool DESTINATION bin) |
1126 |
- |
1127 |
- add_executable(ceph-objectstore-tool |
1128 |
- ceph_objectstore_tool.cc |
1129 |
- rebuild_mondb.cc |
1130 |
- RadosDump.cc) |
1131 |
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) |
1132 |
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) |
1133 |
- if(WITH_FUSE) |
1134 |
- target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES}) |
1135 |
- endif(WITH_FUSE) |
1136 |
|
1137 |
diff --git a/sys-cluster/ceph/files/ceph.confd-r4 b/sys-cluster/ceph/files/ceph.confd-r4 |
1138 |
deleted file mode 100644 |
1139 |
index b8a0c930a49..00000000000 |
1140 |
--- a/sys-cluster/ceph/files/ceph.confd-r4 |
1141 |
+++ /dev/null |
1142 |
@@ -1,70 +0,0 @@ |
1143 |
-# /etc/conf.d/ceph: startup configurations for ceph |
1144 |
- |
1145 |
-# default ceph conf file |
1146 |
-#ceph_conf="/etc/ceph/ceph.conf" |
1147 |
- |
1148 |
-# Set ulimits for Ceph services. |
1149 |
-#rc_ulimit="-n 1048576 -u 1048576" |
1150 |
- |
1151 |
-# the directory under /run to store runtime information in |
1152 |
-#rundir=/run/ceph |
1153 |
- |
1154 |
-# the user and group to run ceph as |
1155 |
-#user="ceph" |
1156 |
-#group="ceph" |
1157 |
- |
1158 |
-# tell openrc to use control groups to make sure everything gets killed |
1159 |
-# properly on stop. Highly reccommended to leave this enabled. |
1160 |
-rc_cgroup_cleanup=1 |
1161 |
- |
1162 |
-# settings for openrc supervisor for various ceph daemons |
1163 |
-# |
1164 |
-# defaults (can be overidden for each daemon) |
1165 |
-# stderr and stdout values get .${id}-std{out,err}.log appended |
1166 |
-# to the provided value |
1167 |
-# |
1168 |
-#respawn_delay=20 |
1169 |
-#respawn_max=5 |
1170 |
-#respawn_period=1800 |
1171 |
-#stdout="/dev/null" |
1172 |
-#stderr="/dev/null" |
1173 |
- |
1174 |
-# radosgw |
1175 |
-#radosgw_respawn_max |
1176 |
-#radosgw_respawn_delay=20 |
1177 |
-#radosgw_respawn_period=1800 |
1178 |
-#radosgw_stdout="/dev/null" |
1179 |
-#radosgw_stderr="/dev/null" |
1180 |
- |
1181 |
-# mon |
1182 |
-#mon_respawn_max=5 |
1183 |
-#mon_respawn_delay=20 |
1184 |
-#mon_respawn_period=1800 |
1185 |
-#mon_stdout="/dev/null" |
1186 |
-#mon_stderr="/dev/null" |
1187 |
- |
1188 |
-# osd |
1189 |
-#osd_respawn_max=5 |
1190 |
-#osd_respawn_delay=30 |
1191 |
-#osd_respawn_period=1800 |
1192 |
-#osd_stdout="/dev/null" |
1193 |
-#osd_stderr="/dev/null" |
1194 |
- |
1195 |
-# mds |
1196 |
-#mds_respawn_max=5 |
1197 |
-#mds_respawn_delay=20 |
1198 |
-#mds_respawn_period=1800 |
1199 |
-#mds_stdout="/dev/null" |
1200 |
-#mds_stderr="/dev/null" |
1201 |
- |
1202 |
-# mgr |
1203 |
-#mgr_respawn_max=5 |
1204 |
-#mgr_respawn_delay=20 |
1205 |
-#mgr_respawn_period=1800 |
1206 |
-#mgr_stdout="/dev/null" |
1207 |
-#mgr_stderr="/dev/null" |
1208 |
- |
1209 |
-# initd stop timeout. |
1210 |
-#CEPH_TERMTIMEOUT="TERM/120/KILL/5" |
1211 |
-# |
1212 |
-# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet: |
1213 |
|
1214 |
diff --git a/sys-cluster/ceph/files/ceph.initd-r11 b/sys-cluster/ceph/files/ceph.initd-r11 |
1215 |
deleted file mode 100644 |
1216 |
index 23827e1a562..00000000000 |
1217 |
--- a/sys-cluster/ceph/files/ceph.initd-r11 |
1218 |
+++ /dev/null |
1219 |
@@ -1,115 +0,0 @@ |
1220 |
-#!/sbin/openrc-run |
1221 |
- |
1222 |
-# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc |
1223 |
-_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}" |
1224 |
-if [ -r "${_CONFD_FILE}" ]; then |
1225 |
- . "${_CONFD_FILE}" || exit 1 |
1226 |
-fi |
1227 |
- |
1228 |
-: "${ceph_conf:=/etc/ceph/ceph.conf}" |
1229 |
-daemon_type="${RC_SVCNAME#ceph-}" |
1230 |
-daemon_type="${daemon_type%%.*}" |
1231 |
-daemon_id="${RC_SVCNAME#ceph-*.}" |
1232 |
-daemon_id="${daemon_id:-0}" |
1233 |
-: "${rundir:=/run/ceph}" |
1234 |
-: "${user:=ceph}" |
1235 |
-: "${group:=ceph}" |
1236 |
-: "${rc_ulimit:=-n 1048576 -u 1048576}" |
1237 |
- |
1238 |
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" |
1239 |
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" |
1240 |
- |
1241 |
-command="/usr/bin/${RC_SVCNAME%%.*}" |
1242 |
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" |
1243 |
-extra_commands="reload" |
1244 |
-command_args_foreground="--foreground" |
1245 |
- |
1246 |
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" |
1247 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
1248 |
-supervise_daemon_args="--user ${user} --group ${group}" |
1249 |
- |
1250 |
-: "${supervisor:=supervise-daemon}" |
1251 |
-: "${stdout:=/var/log/ceph/ceph}" |
1252 |
-: "${stderr:=/var/log/ceph/ceph}" |
1253 |
-: "${respawn_delay:=10}" |
1254 |
-: "${respawn_max:=5}" |
1255 |
-: "${respawn_period:=1800}" |
1256 |
- |
1257 |
-: "${osd_respawn_delay:=15}" |
1258 |
-: "{osd_respawn_max:=10}" |
1259 |
- |
1260 |
-: "{radosgw_respawn_max:=5}" |
1261 |
-: "${radosgw_respawn_period:=30}" |
1262 |
- |
1263 |
-depend() { |
1264 |
- use dns logger |
1265 |
- after net ntpd ntp-client chronyd |
1266 |
- before netmount |
1267 |
-} |
1268 |
- |
1269 |
-is_type_valid() { |
1270 |
- case ${daemon_type} in |
1271 |
- mon|mds|osd|mgr|radosgw) return 0;; |
1272 |
- *) return 1;; |
1273 |
- esac |
1274 |
-} |
1275 |
- |
1276 |
-start_pre() { |
1277 |
- local log_dir |
1278 |
- export CEPH_CONF="${ceph_conf}" |
1279 |
- |
1280 |
- checkpath -d -q -o "${user}:${group}" "${rundir}" |
1281 |
- |
1282 |
- if ! is_type_valid ;then |
1283 |
- eerror "Please give valid Ceph Server Type: mds, mon, osd" |
1284 |
- return 1 |
1285 |
- |
1286 |
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then |
1287 |
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start" |
1288 |
- return 1 |
1289 |
- fi |
1290 |
- |
1291 |
- if [ -n "${bluestore_osd_fsid}" ]; then |
1292 |
- einfo "Mounting Bluestore" |
1293 |
- ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd |
1294 |
- fi |
1295 |
- |
1296 |
- if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then |
1297 |
- command_args="${command_args} --name client.${daemon_id}" |
1298 |
- fi |
1299 |
- |
1300 |
- local arg_name arg_val repl_arg_name |
1301 |
- for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do |
1302 |
- eval arg_val="\${${daemon_type}_${arg_name}}" |
1303 |
- |
1304 |
- if [ -z "${arg_val}" ]; then |
1305 |
- eval arg_val="\${${arg_name}}" |
1306 |
- else |
1307 |
- eval "${arg_name}=\"${arg_val}\"" |
1308 |
- fi |
1309 |
- |
1310 |
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then |
1311 |
- local log_file log_postfix |
1312 |
- log_postfix=".${daemon_id}-${arg_name}.log" |
1313 |
- log_file="${arg_val}" |
1314 |
- |
1315 |
- if [ "${log_file}" != /dev/null ]; then |
1316 |
- log_file="${log_file}${log_postfix}" |
1317 |
- |
1318 |
- log_dir="$(dirname "${log_file}")" |
1319 |
- checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}" |
1320 |
- fi |
1321 |
- |
1322 |
- repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)" |
1323 |
- supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}" |
1324 |
- fi |
1325 |
- done |
1326 |
-} |
1327 |
- |
1328 |
-reload() { |
1329 |
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" |
1330 |
- start-stop-daemon --signal 1 "${start_stop_daemon_args}" |
1331 |
- eend ${?} |
1332 |
-} |
1333 |
- |
1334 |
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |
1335 |
|
1336 |
diff --git a/sys-cluster/ceph/files/ceph.initd-r9 b/sys-cluster/ceph/files/ceph.initd-r9 |
1337 |
deleted file mode 100644 |
1338 |
index cfbd58e4b57..00000000000 |
1339 |
--- a/sys-cluster/ceph/files/ceph.initd-r9 |
1340 |
+++ /dev/null |
1341 |
@@ -1,97 +0,0 @@ |
1342 |
-#!/sbin/openrc-run |
1343 |
- |
1344 |
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" |
1345 |
-extra_commands="reload" |
1346 |
-daemon_type="${RC_SVCNAME#ceph-}" |
1347 |
-daemon_type="${daemon_type%%.*}" |
1348 |
-daemon_id="${RC_SVCNAME#ceph-*.}" |
1349 |
-daemon_id="${daemon_id:-0}" |
1350 |
-: ${rundir:=/run/ceph} |
1351 |
-: ${user:=ceph} |
1352 |
-: ${group:=ceph} |
1353 |
-: ${rc_ulimit:=-n 1048576 -u 1048576} |
1354 |
- |
1355 |
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" |
1356 |
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" |
1357 |
- |
1358 |
-command="/usr/bin/${RC_SVCNAME%%.*}" |
1359 |
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" |
1360 |
-command_args_foreground="--foreground" |
1361 |
- |
1362 |
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" |
1363 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
1364 |
-supervise_daemon_args="--user ${user} --group ${group}" |
1365 |
- |
1366 |
-: ${supervisor:=supervise-daemon} |
1367 |
-: ${stdout:=/var/log/ceph/ceph} |
1368 |
-: ${stderr:=/var/log/ceph/ceph} |
1369 |
-: ${respawn_delay:=10} |
1370 |
-: ${respawn_max:=5} |
1371 |
-: ${respawn_period:=1800} |
1372 |
- |
1373 |
-: ${osd_respawn_delay:=15} |
1374 |
-: ${osd_respawn_max:=10} |
1375 |
- |
1376 |
-: ${radosgw_respawn_max:=5} |
1377 |
-: ${radosgw_respawn_period:=30} |
1378 |
- |
1379 |
-depend() { |
1380 |
- use dns logger |
1381 |
- after net ntpd ntp-client chronyd |
1382 |
- before netmount |
1383 |
-} |
1384 |
- |
1385 |
-is_type_valid() { |
1386 |
- case ${daemon_type} in |
1387 |
- mon|mds|osd|mgr|radosgw) return 0;; |
1388 |
- *) return 1;; |
1389 |
- esac |
1390 |
-} |
1391 |
- |
1392 |
-start_pre() { |
1393 |
- export CEPH_CONF="${ceph_conf}" |
1394 |
- |
1395 |
- checkpath -d -q -o "${user}:${group}" "${rundir}" |
1396 |
- |
1397 |
- if ! is_type_valid ;then |
1398 |
- eerror "Please give valid Ceph Server Type: mds, mon, osd" |
1399 |
- return 1 |
1400 |
- |
1401 |
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then |
1402 |
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start" |
1403 |
- return 1 |
1404 |
- fi |
1405 |
- |
1406 |
- local arg_name arg_val |
1407 |
- for arg_name in std{out,err} respawn_{delay,max,period}; do |
1408 |
- eval arg_val="\${${daemon_type}_${arg_name}}" |
1409 |
- |
1410 |
- if [ -z "${arg_val}" ]; then |
1411 |
- eval arg_val="\${${arg_name}}" |
1412 |
- else |
1413 |
- eval "${arg_name}=\"${arg_val}\"" |
1414 |
- fi |
1415 |
- |
1416 |
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then |
1417 |
- local log_file log_postfix |
1418 |
- log_postfix=".${daemon_id}-${arg_name}.log" |
1419 |
- log_file="${arg_val}" |
1420 |
- |
1421 |
- if [ "${log_file}" != /dev/null ]; then |
1422 |
- log_file="${log_file}${log_postfix}" |
1423 |
- fi |
1424 |
- |
1425 |
- checkpath -m 0755 -o "${user}:${group}" -d $(dirname "${log_file}") |
1426 |
- |
1427 |
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}" |
1428 |
- fi |
1429 |
- done |
1430 |
-} |
1431 |
- |
1432 |
-reload() { |
1433 |
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" |
1434 |
- start-stop-daemon --signal 1 "${start_stop_daemon_args}" |
1435 |
- eend ${?} |
1436 |
-} |
1437 |
- |
1438 |
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |