diff options
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/Manifest.gz | bin | 12238 -> 12239 bytes | |||
| -rw-r--r-- | sys-cluster/ceph/Manifest | 4 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch | 111 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-14.2.5-no-virtualenvs.patch | 39 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch | 73 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.5-missing-includes.patch | 12 | ||||
| -rw-r--r-- | sys-cluster/openmpi/Manifest | 2 | ||||
| -rw-r--r-- | sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild | 167 |
8 files changed, 0 insertions, 408 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex a316af8593f2..ead3f8757a09 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 9fb700982cc4..3dec053fe4a8 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -8,7 +8,6 @@ AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a1 AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214 -AUX ceph-14.2.10-build-without-mgr.patch 3248 BLAKE2B a0d435b1e5572d29f5d961bdb5e27da10060777d02c07616cd57abf0a734af0595093f3ead54be6ea74e450543917df55657b08d5f04681468d166c7dd0570ab SHA512 e03cd8dd9f08f348805d04e554e8a4c9bb2d83e931d1ba27c4265084b899031ddee12e3cc289aa927994c35b75a1bc383a0ee6648c7f8fee6864d775bb800fbf AUX ceph-14.2.11-systemd-unit-fix.patch 1110 BLAKE2B 6964fb2e9e09fef25020b8c0f3bdfc225864f3840c63349355111626260116a25c6eff9f3e34a1cdc7d5ddbf2517b8df768f4fb83a9f7d2088393c7dc6a91848 SHA512 c9d43af2d02e77c163b457603d0a519a0849eca4109b828a4e000b5e428679e81396f842f91a521d688f6c5867420a40fe893f529f9bbea9624bbcc4400377fb AUX ceph-14.2.22-build-without-mgr.patch 880 BLAKE2B e18113744dd499e773f730564fc97ae1d4d194b6a88f99aa6a1a47035047aa9491221ca292eaed850db0a5a808380ddc2f3b373e6688472b4e4abf797042ac25 SHA512 d261f641b3ef0298efa622a8eb7db152e617584cfcf5f92a6b61c732de50a3a9c76fe98440e8459aff191a69d87f3bd042663001f505bfef6498b1fb1f409c70 AUX ceph-14.2.22-cflags.patch 981 BLAKE2B be9729419323db95927264b6ba8db6243bea812889a61041fa5d27e453a5c7b153a4adf322fc6fa5eb91b18dc8907cff50eb2da099fdad10b42fa80947ff1bc7 SHA512 bc9957948d538bf7a014053f588b0162aad2d8ffdf61f20fbcebe3f163c695d46cb7b485941f91e03c2dcedc691133babd55e1ba060eb0a571a72e735edbba22 @@ -16,15 +15,12 @@ AUX ceph-14.2.22-no-virtualenvs.patch 2166 BLAKE2B ef890bbe39597774577d118730040 AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b AUX ceph-14.2.4-python-executable.patch 922 BLAKE2B a5c9e8c70de62a974ea0bea4159874447d725a566d75a026ca125a7db0f24a8d92212d067c8dd91b75ec1e2aab12e46da464f320c7e696cc916e29a4e0d28f93 SHA512 b263de28897f05fc3a201622b90a222bb2c6605d4e6d8921d3c8101247a41a44e1f9da4242f208e1ef4d10ae028917510f4390cc69595b77b723545f0f72eeb2 AUX ceph-14.2.4-undefined-behaviour.patch 1990 BLAKE2B 4f9839bc05c95d40c870f346ebb1856f2846adb26fcbbed67e260f47def9b7167bac4a15917262e8c9dbb99cb83892da2aa315b6d9ee8cd60eb222876dc56482 SHA512 15e4df7cadb02e65144dffea3c287e853e27a04c18281c13282409f1bc28184f31b80d505123a3a29e5394fa0b5e3e3f1246bb70353f142e52e19939149a341e -AUX ceph-14.2.5-no-virtualenvs.patch 2144 BLAKE2B 1ade0666aa6dcaee8bf9da5d6e0d4f9c433afe2e59f7403d37409923f23c5de5de4451cf7193d57198c6b7617333f0ac7acdb2299411550f9bda833a9feb1e51 SHA512 e40fdef0c5b55393863cd662f52354f33f175519d746ee0ac37803616f02f9c207aeca0a1af8ecdc93742a3a63b97869a2032078a419c5746582c96fc7ecd012 -AUX ceph-15.2.0-no-virtualenvs.patch 3197 BLAKE2B 356a5d465e449b9de1ec2e0f1f1b38950954844bc3d47a2ba22118aba5376b050fbd56b366fe2913f87fa1ef7822ad4a6fff93511d02c67e3718bab0a1962b7a SHA512 181d56a168875ede97b1945976481061c5632ae79232f9d35a00adb4e5d1cf0acc9bd2e4ac7a62638574b149bcac639522c9914a08636603504385e0cbdd1292 AUX ceph-15.2.0-rocksdb-cmake.patch 703 BLAKE2B 1c99a1a89be22cedf39326cbf7d6e381c76598ceb8efd4dc6e9f97033c8e654314b8a59c147a7d5daf0305aaedbb4ceb14b9c14e79f61e8fa789e74c0205b1f4 SHA512 20256de5c3227caa149f8285bcc90fcbd67be8cefa568fb72ad0d43688f1f62db7c7fc231dfd4ecf2dd11be68bf1ccc284ebbc691a82a26f3968200f12c82097 AUX ceph-15.2.15-no-virtualenvs.patch 3214 BLAKE2B fbd06b7cfae102059487797f2c78547587fcb4deb190b883f757be61b785b6a1c65d2864657292af9657b7426ae3651579c5a6af1b2b7470b9429932eb3afa3a SHA512 2e27518ce830e237ed3123afd099a16042a2e6503642f393e535c27f23d9cbbf79bd87870bab069e0129d9bbf0942b975fe0e3b1737cfc5dc945decb5870cba6 AUX ceph-15.2.15-snappy-1.1.9.patch 1371 BLAKE2B 804552da2dceabd1aa96b56dffea2d5a5635a3a0ea8f30de16fc6c2ad6f7055b887c069db3a7b6650a1d2a963f1413461964ad8035d213c866ca332ebdca92f4 SHA512 b22064bf613cab2d1b36a6467d9dc2e5522c734a9030566fec28aa3a9cdc676d135cf7f5d6f2e96bfffc9c94f4b833a7d9274bf90afac45d2957fb94007258a8 AUX ceph-15.2.2-systemd-unit.patch 682 BLAKE2B 1ec8c0a23fc7d572c79ca24aaf82100e108e2bb4f99ca2c695efcbefdc9543f853fff16c3f7b4636a38260e5ab9251228e9da1bf1a5cbc7a237c78e52bc8bf3a SHA512 8be953b7873f7e45f7f859ac9074b0f446a2ae6954997f93bcb2bdb2c1d85d36bb3fee571b3e57590131bbca3ff202911e0b31340cec8e39d447163c36bfdc1b AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb13df14574e48300d1331dc2b31353f1ccac40f723de501c6e33bc6f065f4b4500048de9d9b0bae646c76ba715eab580a SHA512 c2890202820d022bf610d6317b0a6e3521da2060bb12e39ba1a5c347096d5688adcd98b1cbf25ad33ddfa78d3cae42669c21f4e1dbe6eceb150e4ee17bece582 AUX ceph-15.2.4-system-uring.patch 2170 BLAKE2B aabfb8c5085de8d69c9afedd20cb99161fd556148f1e6c88c35ed1bdb83dafe28ddbe75ac1e579e23d0728856bb2c650895ab4c0791b0f8e6acf2652822b14f1 SHA512 8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823 -AUX ceph-15.2.5-missing-includes.patch 435 BLAKE2B 66c4b30629203694bd0d5c82f5977a0576c67b3cb14d678e6ab60bc7a933e65306b122e253856bae7862637564e14a93b9cd2c48c9b510e01cc316fc7be9f218 SHA512 84de66f64ea96cd59b40dfb5b8c5d093fe49df1139b45ad9d1bd6b9ebd2f1200b6e931adcf032639a4995af322cf05c1ef9050eb1cb6673e29e040d4e348b3d5 AUX ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch 901 BLAKE2B 63c2fa7df27a1e60a88a7a3c3509aa834f4d67b1935958aa821db1c2136146819bfa8ae51a3156ba9ae4669c09eee8103181a4dc6a313fb2aee6e2804b6066a9 SHA512 1b681f50d646c04b7e22b214884bcee52866576b22370c32dec034d2119bd86cf767f48f2699ad482686c79c7b2e6b8d8f699f5ee1a58431dd6f1d0f2170b3ec AUX ceph-16.2.0-install-libblk.patch 353 BLAKE2B 762e61d8bde1a7ac9ae89b0092676539adbca058b6b52beafe960efe9a4e753ebe32c8adebe7c394a11204c6f2f59a842b18d892029de1c9082cdd4ec062299f SHA512 f01caac7e01097c8145a6c931c5b5854c664b0f2b1d4a09feeb09238e8366c771d69a2b13ffd57a1b48d273cf86a89a88d6e92cf72108015dbbb151685ec3734 AUX ceph-16.2.0-jaeger-system-boost.patch 469 BLAKE2B ab46d53b0d129bacd4698ea73561b19e340772119e6a14dffa65b9aaccbf88c8b8ac26e919ab5af319fc21d4d4fb46e76652d99588e1261e484cf28d36fdf4d9 SHA512 22f8293138d928c0d0c1d977c15c355ce46b0e3c74ee88d29a04caa61024923d3032805f26e4115fa3e6f0a7e3cfd3f58e3feda2b1665e8ae73d49b50270c053 diff --git a/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch b/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch deleted file mode 100644 index 0742945c0184..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch +++ /dev/null @@ -1,111 +0,0 @@ -commit 41c1cee88b38bc43002b232ede42dc157364f61a -Author: Casey Bodley <cbodley@redhat.com> -Date: Fri Nov 1 16:04:37 2019 -0400 - - cmake: define mgr_cap_obj library when WITH_MGR=OFF - - resolves the cmake error when WITH_MGR=OFF: - - Error evaluating generator expression: - - $<TARGET_OBJECTS:mgr_cap_obj> - - Objects of target "mgr_cap_obj" referenced but no such target exists. - Call Stack (most recent call first): - src/mon/CMakeLists.txt:34 (add_library) - - Signed-off-by: Casey Bodley <cbodley@redhat.com> - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 275a8ebd17..c2a9d7a669 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -473,9 +473,7 @@ if(WITH_LIBRADOSSTRIPER) - add_subdirectory(libradosstriper) - endif() - --if(WITH_MGR) -- add_subdirectory(mgr) --endif() -+add_subdirectory(mgr) - - set(librados_config_srcs - librados-config.cc) -diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt -index 79227bcc1d..e69335eb69 100644 ---- a/src/mgr/CMakeLists.txt -+++ b/src/mgr/CMakeLists.txt -@@ -1,37 +1,39 @@ - add_library(mgr_cap_obj OBJECT - MgrCap.cc) - --set(mgr_srcs -- ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc -- ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc -- ActivePyModule.cc -- ActivePyModules.cc -- BaseMgrModule.cc -- BaseMgrStandbyModule.cc -- ClusterState.cc -- DaemonHealthMetricCollector.cc -- DaemonServer.cc -- DaemonState.cc -- Gil.cc -- Mgr.cc -- MgrStandby.cc -- OSDPerfMetricTypes.cc -- OSDPerfMetricCollector.cc -- PyFormatter.cc -- PyModule.cc -- PyModuleRegistry.cc -- PyModuleRunner.cc -- PyOSDMap.cc -- StandbyPyModules.cc -- mgr_commands.cc -- $<TARGET_OBJECTS:mgr_cap_obj>) --add_executable(ceph-mgr ${mgr_srcs}) --target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") --target_link_libraries(ceph-mgr -- osdc client heap_profiler -- global-static ceph-common -- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} -- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) --set_target_properties(ceph-mgr PROPERTIES -- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) --install(TARGETS ceph-mgr DESTINATION bin) -+if(WITH_MGR) -+ set(mgr_srcs -+ ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc -+ ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc -+ ActivePyModule.cc -+ ActivePyModules.cc -+ BaseMgrModule.cc -+ BaseMgrStandbyModule.cc -+ ClusterState.cc -+ DaemonHealthMetricCollector.cc -+ DaemonServer.cc -+ DaemonState.cc -+ Gil.cc -+ Mgr.cc -+ MgrStandby.cc -+ OSDPerfMetricTypes.cc -+ OSDPerfMetricCollector.cc -+ PyFormatter.cc -+ PyModule.cc -+ PyModuleRegistry.cc -+ PyModuleRunner.cc -+ PyOSDMap.cc -+ StandbyPyModules.cc -+ mgr_commands.cc -+ $<TARGET_OBJECTS:mgr_cap_obj>) -+ add_executable(ceph-mgr ${mgr_srcs}) -+ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") -+ target_link_libraries(ceph-mgr -+ osdc client heap_profiler -+ global-static ceph-common -+ Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} -+ ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) -+ set_target_properties(ceph-mgr PROPERTIES -+ POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) -+ install(TARGETS ceph-mgr DESTINATION bin) -+endif() diff --git a/sys-cluster/ceph/files/ceph-14.2.5-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.5-no-virtualenvs.patch deleted file mode 100644 index 5b7cb41c87ad..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.5-no-virtualenvs.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt -index b6c7861838..8ce95a93a5 100644 ---- a/src/pybind/mgr/dashboard/CMakeLists.txt -+++ b/src/pybind/mgr/dashboard/CMakeLists.txt -@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) - - add_custom_target(mgr-dashboard-test-venv - COMMAND -- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} -+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard - COMMENT "dashboard tests virtualenv is being created") - add_dependencies(tests mgr-dashboard-test-venv) -@@ -14,9 +14,9 @@ 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() -+ #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}" -@@ -41,9 +41,9 @@ else() - - 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 -p --node=10.13.0 -+ #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 -p --node=10.13.0 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "dashboard nodeenv is being installed" - ) diff --git a/sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch deleted file mode 100644 index 097639c1bb79..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake -index c9ee8c1b8f..09f75543da 100644 ---- a/cmake/modules/AddCephTest.cmake -+++ b/cmake/modules/AddCephTest.cmake -@@ -68,14 +68,6 @@ function(add_tox_test name) - endif() - string(REPLACE ";" "," tox_envs "${tox_envs}") - find_package(Python3 QUIET REQUIRED) -- 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 4224499c47..9a6c87595b 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=${Python_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 9a8a03f0a8..8fbf65988e 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}" -@@ -29,10 +26,8 @@ else() - set(nodeenv NODEENV) - - 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 -p --node=10.18.1 -+ OUTPUT "/bin/npm" -+ COMMAND /bin/nodeenv -p --node=10.18.1 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "dashboard nodeenv is being installed" - ) diff --git a/sys-cluster/ceph/files/ceph-15.2.5-missing-includes.patch b/sys-cluster/ceph/files/ceph-15.2.5-missing-includes.patch deleted file mode 100644 index 5f4ed843ddc3..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.5-missing-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/tools/rbd/action/Bench.cc b/src/tools/rbd/action/Bench.cc -index aa6edbc18b..90c551c179 100644 ---- a/src/tools/rbd/action/Bench.cc -+++ b/src/tools/rbd/action/Bench.cc -@@ -9,6 +9,7 @@ - #include "common/ceph_mutex.h" - #include "include/types.h" - #include "global/signal_handler.h" -+#include <atomic> - #include <iostream> - #include <boost/accumulators/accumulators.hpp> - #include <boost/accumulators/statistics/stats.hpp> diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest index 15e8271eddb1..edf6fd4f4aa7 100644 --- a/sys-cluster/openmpi/Manifest +++ b/sys-cluster/openmpi/Manifest @@ -2,7 +2,6 @@ AUX hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch 1602 BLAKE2B d15d AUX openmpi-ltdl.patch 2449 BLAKE2B 4ea973f09988a45485840cb70dd8f1c72f6b51d38d051f700fe04cd38ea79ca08c81cd8930504b38633fbb31a081cc9e5819c21e1170fa0461870467846a6c52 SHA512 4487ecbd2025d561f5ac46c70da5e407f6f201b7588f350d1211790dceb64ec2acdf3ca8f90e2ecbe8a6f7c3a6577e77fb7ae22be0ff3dd4adbded9035a7b6c9 DIST openmpi-1.10.7.tar.bz2 13435131 BLAKE2B c1914e6842f59a4a21a27d015275eff00092e57784c4219f58424fbc69c6d9e58109aa1b2ff4e1e340ddc3b93f07d7271e728928772c66c271442e375c08315e SHA512 9c5470f9959ca37650a59e56fb8343c028422c709876ab9d25a411dd09a07cdde927c45d8f3db1ad524b1f2847fe799471d469fa1efee48f8018b2ff24427ecb DIST openmpi-1.4.5.tar.bz2 6643760 BLAKE2B 6890e8ed6f75e77e0e02c88bce473a37195549bca06696881cf7c3f6e46db25abaa04d9517d7ff9a11ad64cc97cf8d1b8678d9797c49a1659656d8a5de5c56ae SHA512 f89922345cde8978483e397e9016103626db3f1787f9afccaf0f60d59caa2a4409b47b01ac221d60e24e241f2afecb636ca89688bf326dc0ca5c817de96b3e99 -DIST openmpi-1.6.5.tar.bz2 10943881 BLAKE2B 8022d8a146d7e99a01e734d9c9725882bb359a2419dc27afe6a2dc2e8bbc8bca03ec1311e10a12068dd38d0f9c442d1efe5af755192a2ad2af332a1459369953 SHA512 b0ede0264cd9263b8ba59ec51d17ad47b5f20d49d219ca05f7c396d608398d517b2023a46a2535fd6191160d709e4805c4de436dcfee56eda287383bd69f9652 DIST openmpi-1.7.5.tar.bz2 13286694 BLAKE2B 15862d34f8b8db60e7896f57274555df849713492c6e7e590feb06ec9b3655ff0311a81c0a6c87cc16dc8fd95510a1d79b23467af843d37768f75005ff4edd8c SHA512 72de2788fa26615a2e7373b5f32e0a2b9e39d56094c45b49348ef19bbb0ea306734b7d3275d76471a18628b5244d882de4ed3595eb46f13683e1c8d2b277f065 DIST openmpi-1.8.8.tar.bz2 13231433 BLAKE2B d196fd0bb08cfb0c86a29ae39015eb15e1465554e322c1ae039b61cee3a027ea0ba8d7fecd02e310309caec416147611a233861e464db4449da3b449387b1dca SHA512 8ca2e3ebb9d9ba0f33faba9bef76fe95293721b73619cbc18176611074a56c277e9ab6cae7fa6c87ace11f16151c1bc495b2a8dbc8ad064d5a8f89f5d431a660 DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5 @@ -17,7 +16,6 @@ DIST openmpi-4.0.6.tar.bz2 9805015 BLAKE2B 2a476fc22a953bd8afb56153ca73e86e27a60 DIST openmpi-4.1.1.tar.bz2 10052770 BLAKE2B 2f853ca44703197469e5ccd42ecd81de72d39f265e0da9d847e6b2f7a7646241b76346c71969bf6a3d4605c28f02de6b587fd0330c753ad7dec8503af0784b69 SHA512 0d85ba45a40c0879f266e5286615e2cf94eb3570f0a705194525821d5c85d460cefc3a2da8207e6e84c479d3d0da656e2342cc2d6f88c4b4577ca22bbeacc89d EBUILD openmpi-1.10.7.ebuild 6255 BLAKE2B 9c95f5795f1ae64079ee6196437bd10fa74cd94cbe38c2923d582ba50041e61fec23accffb9e21c259495b79a37d8a5cc151e6d81818fb7f7840bd40de666671 SHA512 45d7ca9d261a9309acc1e857e3e26ba63d0a39c95bcabca2023b2573c336d2d4ebe25213a037a986bfac38385cf5977ddabe16f7cebcf18a2f697a363fcf2469 EBUILD openmpi-1.4.5.ebuild 2413 BLAKE2B 0e4c9ad51c2f7f44449b0a5d3e1400de600f5337d591dcb89eb938455afa24d891573e03abdfa7434432b8377ffb3f9aefc291881713de0b80fe50322b962ba7 SHA512 187962e3788b94607b9a22728c6f90405cd4c49007413e9d0cfb4df45d5e67f30bcd2129ae8132d08460d9760891f2b15539f995e481962d91c2b7c5a7005002 -EBUILD openmpi-1.6.5-r1.ebuild 4944 BLAKE2B 8e5686a037431c45d7ebde9e82e633f138dc887ca2f1cc2ae24e76dc800ace2a79f63f6c7804794cde1cad5ec7e84b00ded707d84424d7a6413da9c80359fb51 SHA512 008b5b5ad61126d5a758784f6c2c805a55837de6dc109c11758941e2e3a414d3361ba3dbb3959185e2b6b3f02eb7ecf4a8aadb76bea0b872e463c13620a48a08 EBUILD openmpi-1.7.5-r1.ebuild 4695 BLAKE2B c00f8c11c18323c38a9ed700693d9b67313588d04facacf24f29fae2d625aaa6fe5643adb01f9505effefd5314ce016730a1ff350ab7d467876be6d36d556135 SHA512 07050a17e0f331301f07b7de3473c9f7eb0e89741e39206b69f18d0cb48beb0541c29557ebc7e833a0e79df6405a22eace83799b6b4745a9bdda26d6919ddcc5 EBUILD openmpi-1.8.8.ebuild 5249 BLAKE2B 6fbf1a0adad811879e393672e6425f1766fbe69e51479a8eaa9cb456f506077833fe07e8befe274546de5e0fe5a93c96b17e5ff1a23a71d8518e9d05a5851380 SHA512 f423c2423f12ca013c393bc14c42841acf910674770124eb4f8a81220606e80ae46795d27524242ea98e83f5d5aaf4bc53358097cffc4b54ce908b93b4eb41bd EBUILD openmpi-2.0.4.ebuild 5865 BLAKE2B d16aaad399c13dedfeaffdc1c171c3a93a3394969b258c8b6a1b3b44494d8bdbb680f04c6a77cccef65baec41da2c7c9a408c895bdf74a8509239e786380c807 SHA512 82a99b9e2fde11a9f9b847077e0c685f467b7764d638580bbe6175c6d0065a085cf44d30101859ca7025eddaa5b041d370a7e1cb4acb104eb273d38e88c8e33f diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild deleted file mode 100644 index 67707c0f73f6..000000000000 --- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -FORTRAN_NEEDED=fortran - -inherit autotools fortran-2 flag-o-matic toolchain-funcs - -MY_P=${P/-mpi} -S=${WORKDIR}/${MY_P} - -IUSE_OPENMPI_FABRICS=" - openmpi_fabrics_dapl - openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm - openmpi_fabrics_sctp" - -IUSE_OPENMPI_RM=" - openmpi_rm_pbs - openmpi_rm_slurm" - -IUSE_OPENMPI_OFED_FEATURES=" - openmpi_ofed_features_control-hdr-padding - openmpi_ofed_features_connectx-xrc - openmpi_ofed_features_rdmacm - openmpi_ofed_features_dynamic-sl - openmpi_ofed_features_failover - " - -DESCRIPTION="A high-performance message passing library (MPI)" -HOMEPAGE="https://www.open-mpi.org" -SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" -IUSE="+cxx fortran heterogeneous ipv6 mpi-threads romio threads vt - ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" - -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) - openmpi_rm_pbs? ( !openmpi_rm_slurm ) - openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )" - -RDEPEND=" - !sys-cluster/mpich - !sys-cluster/mpich2 - !sys-cluster/pmix - <sys-apps/hwloc-2 - dev-libs/libltdl:0 - openmpi_fabrics_dapl? ( sys-fabric/dapl ) - openmpi_fabrics_ofed? ( sys-fabric/ofed ) - openmpi_fabrics_knem? ( sys-cluster/knem ) - openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) - openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) - openmpi_rm_pbs? ( sys-cluster/torque ) - openmpi_rm_slurm? ( sys-cluster/slurm ) - openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) - vt? ( - !dev-libs/libotf - !app-text/lcdf-typetools - ) - " -DEPEND="${RDEPEND}" -# TODO: Newer releases of Vampir use otf2 which would resolve the above blockers. - -pkg_setup() { - fortran-2_pkg_setup - if use mpi-threads; then - echo - ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by" - ewarn "default and officially unsupported by upstream." - ewarn "You may stop now and set USE=-mpi-threads" - echo - fi - - echo - elog "OpenMPI has an overwhelming count of configuration options." - elog "Don't forget the EXTRA_ECONF environment variable can let you" - elog "specify configure options if you find them necessary." - echo - -} - -src_prepare() { - default - # Necessary for scalibility, see - # http://www.open-mpi.org/community/lists/users/2008/09/6514.php - if use threads; then - echo 'oob_tcp_listen_mode = listen_thread' \ - >> opal/etc/openmpi-mca-params.conf - fi - - # https://svn.open-mpi.org/trac/ompi/ticket/3649 - # https://svn.open-mpi.org/trac/ompi/ticket/3648 - eapply "${FILESDIR}"/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch - - # https://github.com/open-mpi/ompi/issues/163 - eapply "${FILESDIR}"/openmpi-ltdl.patch - - AT_M4DIR="config opal/config orte/config ompi/config" eautoreconf -} - -src_configure() { - local myconf=( - --sysconfdir="${EPREFIX}/etc/${PN}" - --enable-pretty-print-stacktrace - --enable-orterun-prefix-by-default - --with-hwloc="${EPREFIX}/usr" - --with-libltdl=external - ) - - if use mpi-threads; then - myconf+=( - --enable-mpi-thread-multiple - --enable-opal-multi-threads - ) - fi - - if use fortran; then - if [[ $(tc-getFC) =~ g77 ]]; then - myconf+=(--disable-mpi-f90) - elif [[ $(tc-getFC) =~ if ]]; then - # Enabled here as gfortran compile times are huge with this enabled. - myconf+=(--with-mpi-f90-size=medium) - fi - else - myconf+=(--disable-mpi-f90 --disable-mpi-f77) - fi - - ! use vt && myconf+=(--enable-contrib-no-build=vt) - - econf "${myconf[@]}" \ - $(use_enable cxx mpi-cxx) \ - $(use_enable romio io-romio) \ - $(use_enable heterogeneous) \ - $(use_enable ipv6) \ - $(use_with openmpi_fabrics_dapl udapl "${EPREFIX}"/usr) \ - $(use_with openmpi_fabrics_ofed openib "${EPREFIX}"/usr) \ - $(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \ - $(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \ - $(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \ - $(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \ - $(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \ - $(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \ - $(use_enable openmpi_ofed_features_failover btl-openib-failover) \ - $(use_with openmpi_fabrics_sctp sctp) \ - $(use_with openmpi_rm_pbs tm) \ - $(use_with openmpi_rm_slurm slurm) -} - -src_install() { - default - # From USE=vt see #359917 - rm "${ED}"/usr/share/libtool || die - dodoc README AUTHORS NEWS VERSION -} - -src_test() { - # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check -} |