diff options
Diffstat (limited to 'sys-cluster/ceph/files')
6 files changed, 160 insertions, 0 deletions
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch b/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch new file mode 100644 index 000000000000..309e00d226dd --- /dev/null +++ b/sys-cluster/ceph/files/ceph-16.2.0-install-libblk.patch @@ -0,0 +1,12 @@ +diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt +index b424482dee..dc4f9b82ae 100644 +--- a/src/blk/CMakeLists.txt ++++ b/src/blk/CMakeLists.txt +@@ -26,6 +26,7 @@ if(WITH_ZBD) + endif() + + add_library(blk ${libblk_srcs}) ++install(TARGETS blk DESTINATION ${CMAKE_INSTALL_LIBDIR}) + target_include_directories(blk PRIVATE "./") + + if(HAVE_LIBAIO) diff --git a/sys-cluster/ceph/files/ceph-16.2.0-jaeger-system-boost.patch b/sys-cluster/ceph/files/ceph-16.2.0-jaeger-system-boost.patch new file mode 100644 index 000000000000..18d5d9c6d513 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-16.2.0-jaeger-system-boost.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0a0d8672a7..a76e7e1842 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -631,6 +631,9 @@ if(WITH_SYSTEM_BOOST) + set_property(TARGET Boost::iostreams APPEND PROPERTY + INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + endif() ++ if (WITH_JAEGER) ++ include_directories("${CMAKE_SOURCE_DIR}/boost/include") ++ endif() + else() + set(BOOST_J 1 CACHE STRING + "max jobs for Boost build") # override w/-DBOOST_J=<n> diff --git a/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch b/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch new file mode 100644 index 000000000000..dd248d51ac61 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch @@ -0,0 +1,35 @@ +diff --git a/cmake/modules/Finduring.cmake b/cmake/modules/Finduring.cmake +index 10c8de4255..c0a4dadfe4 100644 +--- a/cmake/modules/Finduring.cmake ++++ b/cmake/modules/Finduring.cmake +@@ -8,10 +8,10 @@ find_path(URING_INCLUDE_DIR liburing.h) + find_library(URING_LIBRARIES liburing.a liburing) + + include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES URING_INCLUDE_DIR) ++pkg_check_modules(URING REQUIRED liburing) + + if(uring_FOUND AND NOT TARGET uring::uring) +- add_library(uring::uring UNKNOWN IMPORTED) ++ add_library(uring::uring ALIAS ${URING_LIBRARIES}) + set_target_properties(uring::uring PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${URING_INCLUDE_DIR}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" +diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt +index dc4f9b82ae..e39d690394 100644 +--- a/src/blk/CMakeLists.txt ++++ b/src/blk/CMakeLists.txt +@@ -52,10 +52,11 @@ endif() + + if(WITH_LIBURING) + if(WITH_SYSTEM_LIBURING) +- find_package(uring REQUIRED) ++ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}../../cmake/modules/") ++ pkg_check_modules(URING REQUIRED liburing) + else() + include(Builduring) + build_uring() + endif() +- target_link_libraries(blk PRIVATE uring::uring) ++ target_link_libraries(blk PRIVATE ${URING_LIBRARIES}) + endif() diff --git a/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch new file mode 100644 index 000000000000..d8acd4355b59 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-16.2.0-no-virtualenvs.patch @@ -0,0 +1,74 @@ +diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake +index 2c8fdb0b93..07d52b3d67 100644 +--- a/cmake/modules/AddCephTest.cmake ++++ b/cmake/modules/AddCephTest.cmake +@@ -70,14 +70,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 59c28a33f6..7f63e2adf4 100644 +--- a/src/pybind/mgr/dashboard/CMakeLists.txt ++++ b/src/pybind/mgr/dashboard/CMakeLists.txt +@@ -5,9 +5,6 @@ function(add_npm_command) + set(multi_kw COMMAND DEPENDS) + cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) + string(REPLACE ";" " " command "${NC_COMMAND}") +- if(NC_NODEENV) +- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) +- endif() + string(REPLACE " " ";" command "${command}") + add_custom_command( + OUTPUT "${NC_OUTPUT}" +@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM) + set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}") + endif() + add_custom_command( +- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" +- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} +- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv +- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv ${node_mirror_opt} -p --node=12.18.2 +- COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm ++ OUTPUT "/bin/npm" ++ COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2 + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "dashboard nodeenv is being installed" + ) diff --git a/sys-cluster/ceph/files/ceph-16.2.0-rocksdb-cmake.patch b/sys-cluster/ceph/files/ceph-16.2.0-rocksdb-cmake.patch new file mode 100644 index 000000000000..aff00c196d6c --- /dev/null +++ b/sys-cluster/ceph/files/ceph-16.2.0-rocksdb-cmake.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake +index 58ce26a6ac..2f8702c1dc 100644 +--- a/cmake/modules/BuildRocksDB.cmake ++++ b/cmake/modules/BuildRocksDB.cmake +@@ -6,10 +6,6 @@ function(build_rocksdb) + # CMAKE_PREFIX_PATH, for which reason we'll have to use some other separator. + string(REPLACE ";" "!" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}") + list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP}) +- if(CMAKE_TOOLCHAIN_FILE) +- list(APPEND rocksdb_CMAKE_ARGS +- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}) +- endif() + + if(ALLOCATOR STREQUAL "jemalloc") + list(APPEND rocksdb_CMAKE_ARGS -DWITH_JEMALLOC=ON) diff --git a/sys-cluster/ceph/files/ceph-16.2.0-spdk-tinfo.patch b/sys-cluster/ceph/files/ceph-16.2.0-spdk-tinfo.patch new file mode 100644 index 000000000000..19f2cce891fb --- /dev/null +++ b/sys-cluster/ceph/files/ceph-16.2.0-spdk-tinfo.patch @@ -0,0 +1,10 @@ +--- a/src/spdk/app/spdk_top/Makefile 2021-04-02 14:27:44.307824110 -0700 ++++ b/src/spdk/app/spdk_top/Makefile 2021-04-02 14:27:56.722742839 -0700 +@@ -39,6 +39,6 @@ + C_SRCS := spdk_top.c + + SPDK_LIB_LIST = jsonrpc json rpc log util +-LIBS=-lncurses -lpanel -lmenu ++LIBS=-lncurses -ltinfo -lpanel -lmenu + + include $(SPDK_ROOT_DIR)/mk/spdk.app.mk |