sys-cluster/ceph: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

8 files changed, 0 insertions, 374 deletions

diff --git a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
deleted file mode 100644
index be133c121d0c..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ceph-13.2.1/cmake/modules/Distutils.cmake.old	2018-07-26 17:39:56.000000000 -0000
-+++ ceph-13.2.1/cmake/modules/Distutils.cmake	2018-12-24 05:43:51.566174070 -0000
-@@ -58,8 +62,13 @@
- function(distutils_install_cython_module name)
-   get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
-   get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK)
--  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}")
-+  string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
-+  list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
-+  list(APPEND cflags -D'void0=dead_function\(void\)')
-+  list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
-+  string(REPLACE ";" " " cflags "${cflags}")
-+  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}")
-   set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared")
-   install(CODE "
-     set(ENV{CC} \"${PY_CC}\")
-     set(ENV{LDSHARED} \"${PY_LDSHARED}\")
diff --git a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch b/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
deleted file mode 100644
index 3ea6eadbb86f..000000000000
--- a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- ceph-15.2.3.orig/cmake/modules/BuildSPDK.cmake	2020-05-29 09:24:50.000000000 -0700
-+++ ceph-15.2.3/cmake/modules/BuildSPDK.cmake	2020-06-01 10:36:14.629306433 -0700
-@@ -1,5 +1,5 @@
- macro(build_spdk)
--  set(DPDK_DIR ${CMAKE_BINARY_DIR}/src/dpdk)
-+  set(DPDK_DIR ${CMAKE_SOURCE_DIR}/src/dpdk)
-   if(NOT TARGET dpdk-ext)
-     include(BuildDPDK)
-     build_dpdk(${DPDK_DIR})
diff --git a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch b/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
deleted file mode 100644
index 79002b3a5fce..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
-index 01a6fc500c8..9eb4658482f 100644
---- a/cmake/modules/Distutils.cmake
-+++ b/cmake/modules/Distutils.cmake
-@@ -90,7 +90,8 @@ function(distutils_add_cython_module target name src)
-     CXX="${PY_CXX}"
-     LDSHARED="${PY_LDSHARED}"
-     OPT=\"-DNDEBUG -g -fwrapv -w\"
--    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-+    CFLAGS=${CMAKE_C_FLAGS}
-+    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS}
-     CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
-     CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-     ${Python3_EXECUTABLE} ${setup_py}
diff --git a/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch b/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
deleted file mode 100644
index 7f84a19706dc..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/src/common/Cycles.h b/src/common/Cycles.h
-index 16e0aa67fc1..791be43469c 100644
---- a/src/common/Cycles.h
-+++ b/src/common/Cycles.h
-@@ -29,8 +29,9 @@
-  */
- 
- 
--#ifndef CEPH_CYCLES_H
--#define CEPH_CYCLES_H
-+#pragma once
-+
-+#include <cstdint>
- 
- /**
-  * This class provides static methods that read the fine-grain CPU
-@@ -112,4 +113,3 @@ private:
-   }
- };
- 
--#endif  // CEPH_CYCLES_H
-diff --git a/src/common/subsys_types.h b/src/common/subsys_types.h
-index 52171809b23..1a2ab796b6d 100644
---- a/src/common/subsys_types.h
-+++ b/src/common/subsys_types.h
-@@ -53,7 +53,7 @@ ceph_subsys_get_as_array() {
- #undef DEFAULT_SUBSYS
- }
- 
--constexpr static std::uint8_t
-+constexpr static uint8_t
- ceph_subsys_get_max_default_level(const std::size_t subidx) {
-   const auto item = ceph_subsys_get_as_array()[subidx];
-   return std::max(item.log_level, item.gather_level);
-diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
-index c0a8173596e..8d982879aa9 100644
---- a/src/librbd/api/PoolMetadata.h
-+++ b/src/librbd/api/PoolMetadata.h
-@@ -9,6 +9,7 @@
- 
- #include <map>
- #include <string>
-+#include <cstdint>
- 
- namespace librbd {
- 
-diff --git a/src/msg/async/crypto_onwire.h b/src/msg/async/crypto_onwire.h
-index 55f7550868f..2213c21d08d 100644
---- a/src/msg/async/crypto_onwire.h
-+++ b/src/msg/async/crypto_onwire.h
-@@ -95,7 +95,7 @@ public:
-   // Transmitter can append extra bytes of ciphertext at the -final step.
-   // This method return how much was added, and thus let client translate
-   // plaintext size into ciphertext size to grab from wire.
--  virtual std::uint32_t get_extra_size_at_final() = 0;
-+  virtual uint32_t get_extra_size_at_final() = 0;
- 
-   // Instance of RxHandler must be reset before doing any decrypt-update
-   // step. This applies also to situation when decrypt-final was already
-diff --git a/src/test/librados/op_speed.cc b/src/test/librados/op_speed.cc
-index 90c7bdac571..9452da6dcc9 100644
---- a/src/test/librados/op_speed.cc
-+++ b/src/test/librados/op_speed.cc
-@@ -9,7 +9,7 @@ int main() {
-   for (int i = 0; i < to_create; ++i) {
-     librados::ObjectReadOperation op;
-     bufferlist bl;
--    std::uint64_t sz;
-+    uint64_t sz;
-     struct timespec tm;
-     std::map<std::string, ceph::buffer::list> xattrs;
-     std::map<std::string, ceph::buffer::list> omap;
-diff --git a/src/test/mon/test_log_rss_usage.cc b/src/test/mon/test_log_rss_usage.cc
-index f6e85f414c8..9769cabd884 100644
---- a/src/test/mon/test_log_rss_usage.cc
-+++ b/src/test/mon/test_log_rss_usage.cc
-@@ -5,6 +5,7 @@
- #include <string>
- #include <iostream>
- #include <fstream>
-+#include <cstdint>
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch b/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
deleted file mode 100644
index c50cca4e2ca0..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.2-system-zstd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
-index b53b0d9444..5bf5796da2 100644
---- a/src/compressor/zstd/CMakeLists.txt
-+++ b/src/compressor/zstd/CMakeLists.txt
-@@ -1,34 +1,11 @@
- # zstd
- 
--# libzstd - build it statically
--set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3")
--
--include(ExternalProject)
--ExternalProject_Add(zstd_ext
--  SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/build/cmake
--  CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--             -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
--             -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
--             -DCMAKE_AR=${CMAKE_AR}
--             -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED}
--             -G${CMAKE_GENERATOR}
--  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
--  BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target libzstd_static
--  BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a"
--  INSTALL_COMMAND "true")
--
--add_library(zstd STATIC IMPORTED)
--set_target_properties(zstd PROPERTIES
--  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib"
--  IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a")
--add_dependencies(zstd zstd_ext)
--
- set(zstd_sources
-   CompressionPluginZstd.cc
- )
- 
- add_library(ceph_zstd SHARED ${zstd_sources})
--target_link_libraries(ceph_zstd PRIVATE zstd $<$<PLATFORM_ID:Windows>:ceph-common>)
-+target_link_libraries(ceph_zstd zstd)
- set_target_properties(ceph_zstd PROPERTIES
-   VERSION 2.0.0
-   SOVERSION 2
diff --git a/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch
deleted file mode 100644
index 79aee882c2a4..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
-index cd661be16c9..7183c2f2138 100644
---- a/cmake/modules/AddCephTest.cmake
-+++ b/cmake/modules/AddCephTest.cmake
-@@ -55,7 +55,6 @@ endfunction()
- 
- function(add_tox_test name)
-   set(test_name run-tox-${name})
--  set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv)
-   cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN})
-   if(DEFINED TOXTEST_TOX_PATH)
-     set(tox_path ${TOXTEST_TOX_PATH})
-@@ -68,14 +67,6 @@ function(add_tox_test name)
-     list(APPEND tox_envs py3)
-   endif()
-   string(REPLACE ";" "," tox_envs "${tox_envs}")
--  add_custom_command(
--    OUTPUT ${venv_path}/bin/activate
--    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path}
--    WORKING_DIRECTORY ${tox_path}
--    COMMENT "preparing venv for ${name}")
--  add_custom_target(${name}-venv
--    DEPENDS ${venv_path}/bin/activate)
--  add_dependencies(tests ${name}-venv)
-   add_test(
-     NAME ${test_name}
-     COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh
-diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt
-index 9166553dc73..9a6c87595b9 100644
---- a/src/ceph-volume/CMakeLists.txt
-+++ b/src/ceph-volume/CMakeLists.txt
-@@ -8,22 +8,6 @@ if(FREEBSD)
-   add_subdirectory(plugin/zfs)
- endif()
- 
--# Required for running ceph-volume inventory in a vstart environment
--set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv)
--
--add_custom_command(
--  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python
--  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV}
--  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
--  COMMENT "ceph-volume venv is being created")
--
--add_custom_command(
--  OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume
--  DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python
--  COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate
--  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume
--  COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume")
--
- add_custom_target(ceph-volume-venv-setup
-   DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume)
- 
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
-index 0c8d46d65ee..67a618f95aa 100644
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -5,9 +5,6 @@ function(add_npm_command)
-   set(multi_kw COMMAND DEPENDS)
-   cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN})
-   string(REPLACE ";" " " command "${NC_COMMAND}")
--  if(NC_NODEENV)
--    string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command})
--  endif()
-   string(REPLACE " " ";" command "${command}")
-   add_custom_command(
-     OUTPUT "${NC_OUTPUT}"
-@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM)
-     set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}")
-   endif()
-   add_custom_command(
--    OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
--    COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
--    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
--    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=12.18.2
--    COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
-+    OUTPUT "/bin/npm"
-+    COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     COMMENT "dashboard nodeenv is being installed"
-     )
diff --git a/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch b/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch
deleted file mode 100644
index bef4f6199eb0..000000000000
--- a/sys-cluster/ceph/files/ceph-19.1.0-boost-build-none-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/boost/tools/build/src/tools/features/optimization-feature.jam b/src/boost/tools/build/src/tools/features/optimization-feature.jam
-index 761f76f1..fb2a5dec 100644
---- a/src/boost/tools/build/src/tools/features/optimization-feature.jam
-+++ b/src/boost/tools/build/src/tools/features/optimization-feature.jam
-@@ -8,7 +8,7 @@
- import feature ;
- 
- feature.feature optimization
--    : off speed space
-+    : off none speed space
-     : propagated ;
- 
- feature.feature inlining
diff --git a/sys-cluster/ceph/files/ceph.initd-r13 b/sys-cluster/ceph/files/ceph.initd-r13
deleted file mode 100644
index 2d158ad80be3..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r13
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/openrc-run
-
-# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
-_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
-if [ -r "${_CONFD_FILE}" ]; then
-	. "${_CONFD_FILE}" || exit 1
-fi
-
-: "${ceph_conf:=/etc/ceph/ceph.conf}"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: "${rundir:=/run/ceph}"
-: "${user:=ceph}"
-: "${group:=ceph}"
-: "${rc_ulimit:=-n 1048576 -u 1048576}"
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-extra_commands="${extra_commands} reload"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: "${supervisor:=supervise-daemon}"
-: "${stdout:=/var/log/ceph/console/ceph}"
-: "${stderr:=/var/log/ceph/console/ceph}"
-: "${respawn_delay:=10}"
-: "${respawn_max:=5}"
-: "${respawn_period:=1800}"
-
-: "${osd_respawn_delay:=15}"
-: "${osd_respawn_max:=10}"
-
-: "${radosgw_respawn_max:=5}"
-: "${radosgw_respawn_period:=30}"
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	local log_dir
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-
-	if [ -n "${bluestore_osd_fsid}" ]; then
-		einfo "Mounting Bluestore"
-		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
-	fi
-
-	if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
-		command_args="${command_args} --name client.${daemon_id}"
-	fi
-
-	local arg_name arg_val repl_arg_name
-	for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			local log_file log_postfix
-			log_postfix=".${daemon_id}-${arg_name}.log"
-			log_file="${arg_val}"
-
-			if [ "${log_file}" != /dev/null ]; then
-				log_file="${log_file}${log_postfix}"
-
-				log_dir="$(dirname "${log_file}")"
-				checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
-			fi
-
-			repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
-			supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: