commit: 3371e9a6d16a8f87ee52edd62dd3b80d866ad12b Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Jul 15 18:36:33 2022 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Mon Jul 18 17:28:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3371e9a6
sys-cluster/ceph: remove unused patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/26427 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> .../ceph/files/ceph-17.2.0-no-virtualenvs.patch | 68 ---------------------- 1 file changed, 68 deletions(-) diff --git a/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch deleted file mode 100644 index 930dd08e8630..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake -index 0df7125b508..01afc88289c 100644 ---- a/cmake/modules/AddCephTest.cmake -+++ b/cmake/modules/AddCephTest.cmake -@@ -57,7 +57,6 @@ endfunction() - - function(add_tox_test name) - set(test_name run-tox-${name}) -- set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv) - cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN}) - if(DEFINED TOXTEST_TOX_PATH) - set(tox_path ${TOXTEST_TOX_PATH}) -@@ -71,27 +70,13 @@ function(add_tox_test name) - endif() - string(REPLACE ";" "," tox_envs "${tox_envs}") - find_package(Python3 QUIET REQUIRED) -- add_test( -- NAME setup-venv-for-${name} -- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${venv_path} -- WORKING_DIRECTORY ${tox_path}) -- set_tests_properties(setup-venv-for-${name} PROPERTIES -- FIXTURES_SETUP venv-for-${name}) -- add_test( -- NAME teardown-venv-for-${name} -- COMMAND ${CMAKE_COMMAND} -E remove_directory ${venv_path}) -- set_tests_properties(teardown-venv-for-${name} PROPERTIES -- FIXTURES_CLEANUP venv-for-${name}) - add_test( - NAME ${test_name} - COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh - --source-dir ${CMAKE_SOURCE_DIR} - --build-dir ${CMAKE_BINARY_DIR} - --tox-path ${tox_path} -- --tox-envs ${tox_envs} -- --venv-path ${venv_path}) -- set_tests_properties(${test_name} PROPERTIES -- FIXTURES_REQUIRED venv-for-${name}) -+ --tox-envs ${tox_envs}) - set_property( - TEST ${test_name} - PROPERTY ENVIRONMENT -diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt -index 9166553dc73..9a6c87595b9 100644 ---- a/src/ceph-volume/CMakeLists.txt -+++ b/src/ceph-volume/CMakeLists.txt -@@ -8,22 +8,6 @@ if(FREEBSD) - add_subdirectory(plugin/zfs) - endif() - --# Required for running ceph-volume inventory in a vstart environment --set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv) -- --add_custom_command( -- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python -- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV} -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume -- COMMENT "ceph-volume venv is being created") -- --add_custom_command( -- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume -- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python -- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume -- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume") -- - add_custom_target(ceph-volume-venv-setup - DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume) -
