diff options
author | Patrick McLean <chutzpah@gentoo.org> | 2023-04-11 16:28:39 -0700 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2023-04-11 16:28:52 -0700 |
commit | 043478b715372b5abf09a1b992d8ea135f5d3d32 (patch) | |
tree | 0e8b8cdf67b21ed7003277223feb0c6664e5430d /sys-cluster/ceph | |
parent | sys-cluster/ceph: add 17.2.6 (diff) | |
download | gentoo-043478b715372b5abf09a1b992d8ea135f5d3d32.tar.gz gentoo-043478b715372b5abf09a1b992d8ea135f5d3d32.tar.bz2 gentoo-043478b715372b5abf09a1b992d8ea135f5d3d32.zip |
sys-cluster/ceph: drop 15.2.17-r3
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'sys-cluster/ceph')
-rw-r--r-- | sys-cluster/ceph/Manifest | 1 | ||||
-rw-r--r-- | sys-cluster/ceph/ceph-15.2.17-r3.ebuild | 408 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-13.2.0-cflags.patch | 26 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.0-rocksdb-cmake.patch | 15 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.15-no-virtualenvs.patch | 73 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.15-snappy-1.1.9.patch | 14 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.2-systemd-unit.patch | 12 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.4-system-uring.patch | 66 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch | 22 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph.initd-r12 | 115 |
10 files changed, 0 insertions, 752 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index b998db99a74a..40e9e424d312 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,4 +1,3 @@ -DIST ceph-15.2.17.tar.gz 148640102 BLAKE2B a10dd702ffca005a8741bff645eaf2f671300be969edf9e9e321e29abdc34a403de7c56684fd1509d30c2bd32b996fff3aaa88d1d08c3d258d6f5ef43ecefddf SHA512 952cd4db057fcab5efa3c6331fbc19cf1e904f5855266c2ed13e41ffb2e5a7d18ed133bd113fea493149005a182f429eef39931c4ceac7776aefe84a208a745a DIST ceph-16.2.10.tar.gz 157176743 BLAKE2B 065b6f1941f87fde150ab22ba45aa9f58069acf7f33a483456faf0a26e41936846944e800ccd7f99bd8863db8438ae70804621522f75065c0b2506522c4fdd7d SHA512 ae164c24462c3e08763d202acc3e2fe86ffc09f312b5059bae07863e804fc47bd158fc130aa2923246ffcfe26ae6d6d9317326aec96373226e6f9030d7123c8b DIST ceph-16.2.11.tar.gz 157171361 BLAKE2B f9b7398da50b9c5a7a553de0d8db5412745d1077310d57ee8682e1302d49bae2b8454326bd27c7781386c8ba267c41e72b0cc5c142839d7288ebd69662679fd4 SHA512 905e36bc08f5cf1af1eca7fb467dd9e946d44f7ed3561c262afa9caeb35443a445a86e0b1f662754727213a4a123bc2a5eb1f080ec6697743d235449d34681fd DIST ceph-17.2.5.tar.gz 169004360 BLAKE2B b6d8df5f9b58de5e42fed5d16b1c82d2178297f8bb1b6cf9c42ff55d6a5b2e20fe413feeab038738f62342576ef59fff7091b87648c10cf71401377b0ffa5dc8 SHA512 10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e1268eed9e788fe32794d137f6af81abd6a2aeaee39cef44d2c45234a15cc6020 diff --git a/sys-cluster/ceph/ceph-15.2.17-r3.ebuild b/sys-cluster/ceph/ceph-15.2.17-r3.ebuild deleted file mode 100644 index 931743cffc69..000000000000 --- a/sys-cluster/ceph/ceph-15.2.17-r3.ebuild +++ /dev/null @@ -1,408 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_9 ) -CMAKE_MAKEFILE_GENERATOR=emake - -DISTUTILS_OPTIONAL=1 - -inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ - python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles \ - multiprocessing - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ceph/ceph.git" - SRC_URI="" -else - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc - kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk - +system-boost systemd +tcmalloc test uring xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -DEPEND=" - acct-group/ceph - acct-user/ceph - virtual/libudev:= - app-arch/bzip2:= - app-arch/lz4:= - app-arch/snappy:= - app-arch/zstd:= - app-shells/bash:0 - app-misc/jq:= - dev-libs/crypto++:= - dev-cpp/gflags:= - dev-libs/leveldb:=[snappy,tcmalloc(-)?] - dev-libs/libaio:= - dev-libs/libfmt:= - <dev-libs/libfmt-9:= - dev-libs/libnl:3= - dev-libs/libxml2:= - <dev-libs/rocksdb-6.15:= - dev-libs/xmlsec:=[openssl] - dev-cpp/yaml-cpp:= - dev-libs/nss:= - dev-libs/protobuf:= - net-dns/c-ares:= - net-libs/gnutls:= - sys-auth/oath-toolkit:= - sys-apps/coreutils - sys-apps/grep - sys-apps/hwloc:= - sys-apps/keyutils:= - sys-apps/util-linux:= - sys-apps/util-linux - sys-libs/libcap-ng:= - sys-libs/ncurses:0= - sys-libs/zlib:= - sys-process/numactl:= - virtual/libcrypt:= - x11-libs/libpciaccess:= - babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0= ) - jemalloc? ( dev-libs/jemalloc:= ) - !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) - kafka? ( dev-libs/librdkafka:= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lttng? ( dev-util/lttng-ust:= ) - pmdk? ( dev-libs/pmdk:= ) - rabbitmq? ( net-libs/rabbitmq-c:= ) - radosgw? ( - dev-libs/expat:= - dev-libs/openssl:= - net-misc/curl:=[curl_ssl_openssl] - ) - rbd-rwl? ( dev-libs/pmdk:= ) - ssl? ( dev-libs/openssl:= ) - system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP}] ) - !system-boost? ( <sys-libs/glibc-2.34 ) - uring? ( sys-libs/liburing:= ) - xfs? ( sys-fs/xfsprogs:= ) - zfs? ( sys-fs/zfs:= ) -" -BDEPEND=" - ${PYTHON_DEPS} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - app-arch/cpio - >=dev-util/cmake-3.5.0 - dev-python/cython[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - dev-util/gperf - dev-util/ragel - dev-util/valgrind - sys-apps/coreutils - sys-apps/grep - sys-apps/which - sys-devel/bc - sys-devel/patch - virtual/pkgconfig - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - ) -" -RDEPEND="${DEPEND} - ${PYTHON_DEPS} - app-admin/sudo - net-misc/socat - sys-apps/gptfdisk - sys-apps/nvme-cli - >=sys-apps/smartmontools-7.0 - sys-block/parted - sys-fs/cryptsetup - sys-fs/lsscsi - sys-fs/lvm2[lvm] - app-alternatives/awk - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/cherrypy[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pecan[${PYTHON_USEDEP}] - dev-python/prettytable[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - mgr? ( - dev-python/jsonpatch[${PYTHON_USEDEP}] - dev-python/more-itertools[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/routes[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( jemalloc tcmalloc ) - diskprediction? ( mgr ) - kafka? ( radosgw ) - mgr? ( cephfs ) - rabbitmq? ( radosgw ) -" -RESTRICT="!test? ( test )" - -# the tests need root access -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# create a non-debug release -CMAKE_BUILD_TYPE=RelWithDebInfo - -# false positives unless all USE flags are on -CMAKE_WARN_UNUSED_CLI=no - -PATCHES=( - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" - "${FILESDIR}/ceph-14.2.0-cflags.patch" - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" - "${FILESDIR}/ceph-13.2.0-cflags.patch" - "${FILESDIR}/ceph-15.2.15-no-virtualenvs.patch" - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" - "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" - "${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch" - "${FILESDIR}/ceph-15.2.2-systemd-unit.patch" - "${FILESDIR}/ceph-15.2.3-spdk-compile.patch" - "${FILESDIR}/ceph-15.2.4-system-uring.patch" - "${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch" - "${FILESDIR}/ceph-15.2.15-snappy-1.1.9.patch" -) - -check-reqs_export_vars() { - CHECKREQS_DISK_BUILD="5400M" - CHECKREQS_DISK_USR="510M" - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup - check-reqs_export_vars - check-reqs_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if use system-boost; then - find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ - | xargs --null sed -r \ - -e 's|Boost::|boost_|g' \ - -e 's|Boost_|boost_|g' \ - -e 's|[Bb]oost_boost|boost_system|g' -i || die - fi - - sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - -i src/bash_completion/CMakeLists.txt || die - - sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die - - if ! use diskprediction; then - rm -rf src/pybind/mgr/diskprediction_local || die - fi - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t || die -} - -ceph_src_configure() { - local flag - local mycmakeargs=( - -DWITH_BABELTRACE=$(usex babeltrace) - -DWITH_BLUESTORE_PMEM=$(usex pmdk) - -DWITH_CEPHFS=$(usex cephfs) - -DWITH_CEPHFS_SHELL=$(usex cephfs) - -DWITH_DPDK=$(usex dpdk) - -DWITH_SPDK=$(usex spdk) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_GRAFANA=$(usex grafana) - -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=OFF - -DWITH_NUMA=$(usex numa) - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_PYTHON3=3 - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) - -DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka) - -DWITH_RBD_RWL=$(usex rbd-rwl) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_LIBURING=$(usex uring) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED="ON" - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_SYSTEM_ROCKSDB=ON - -DWITH_RDMA=OFF - -DWITH_TBB=OFF - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -Wno-dev - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - # needed for >=glibc-2.32 - has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON) - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ - || die "failed to remove cmake cache" - - cmake_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${S}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - use custom-cflags || strip-flags - ceph_src_configure -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - ceph_src_configure - - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - emake VERBOSE=1 clean - emake VERBOSE=1 all - - # python modules are only compiled with "make install" so we need to do this to - # prevent doing a bunch of compilation in src_install - DESTDIR="${T}" emake VERBOSE=1 install - popd >/dev/null || die -} - -src_compile() { - cmake_build VERBOSE=1 all - - # we have to do this here to prevent from building everything multiple times - python_copy_sources - distutils-r1_src_compile -} - -src_test() { - make check || die "make check failed" -} - -python_install() { - local CMAKE_USE_DIR="${S}" - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - DESTDIR="${ED}" emake VERBOSE=1 install - popd >/dev/null || die - - python_optimize -} - -src_install() { - cmake_src_install - distutils-r1_src_install - - find "${ED}" -name '*.la' -type f -delete || die - - exeinto /usr/$(get_libdir)/ceph - newexe "${BUILD_DIR}/bin/init-ceph" init-ceph - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console - - fowners -R ceph:ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r13" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - insinto /etc/sysctl.d - newins "${FILESDIR}"/sysctld 90-${PN}.conf - - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc - - # units aren't installed by the build system unless systemd is enabled - # so no point installing these with the USE flag disabled - if use systemd; then - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ - "ceph-mds@.service" - - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ - "ceph-osd@.service" - - fi - - udev_dorules udev/*.rules - newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf - - readme.gentoo_create_doc - - python_setup - - # bug #630232 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ - || die "sed failed" - - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' - grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ - | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die - - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) - dostrip -x "${rados_classes[@]#${ED}}" -} - -pkg_postinst() { - readme.gentoo_print_elog - tmpfiles_process ${PN}.conf - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-cluster/ceph/files/ceph-13.2.0-cflags.patch b/sys-cluster/ceph/files/ceph-13.2.0-cflags.patch deleted file mode 100644 index b275a177da35..000000000000 --- a/sys-cluster/ceph/files/ceph-13.2.0-cflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake -index d6572115a4..cc0bdddc9f 100644 ---- a/cmake/modules/BuildBoost.cmake -+++ b/cmake/modules/BuildBoost.cmake -@@ -62,7 +62,7 @@ function(do_build_boost version) - else() - list(APPEND boost_features "address-model=32") - endif() -- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX -+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX - list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") - - list(FIND Boost_BUILD_COMPONENTS "python" with_python) -diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt -index 5a80aa539c..8d6ff5c8f0 100644 ---- a/src/compressor/zstd/CMakeLists.txt -+++ b/src/compressor/zstd/CMakeLists.txt -@@ -1,7 +1,7 @@ - # zstd - - # libzstd - build it statically --set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3") -+set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable $ENV{CFLAGS} -O3") - - include(ExternalProject) - ExternalProject_Add(zstd_ext diff --git a/sys-cluster/ceph/files/ceph-15.2.0-rocksdb-cmake.patch b/sys-cluster/ceph/files/ceph-15.2.0-rocksdb-cmake.patch deleted file mode 100644 index 9b3d34858e76..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.0-rocksdb-cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake -index de9748878b..4b86b36d35 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-15.2.15-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-15.2.15-no-virtualenvs.patch deleted file mode 100644 index 5ef7fb3a73e1..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.15-no-virtualenvs.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake -index c9ee8c1b8f6..09f75543da2 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 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 92e4cdc538b..3153c93c459 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 --verbose -p --node=10.18.1 -+ OUTPUT "npm" -+ COMMAND nodeenv --verbose -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.15-snappy-1.1.9.patch b/sys-cluster/ceph/files/ceph-15.2.15-snappy-1.1.9.patch deleted file mode 100644 index 3319f3989ff9..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.15-snappy-1.1.9.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h -index 25393f8dc1ff4..93206c4007bed 100644 ---- a/src/compressor/snappy/SnappyCompressor.h -+++ b/src/compressor/snappy/SnappyCompressor.h -@@ -97,8 +97,8 @@ class SnappyCompressor : public Compressor { - if (qat_enabled) - return qat_accel.decompress(p, compressed_len, dst, compressor_message); - #endif -- snappy::uint32 res_len = 0; - BufferlistSource source_1(p, compressed_len); -+ uint32_t res_len = 0; - if (!snappy::GetUncompressedLength(&source_1, &res_len)) { - return -1; - } diff --git a/sys-cluster/ceph/files/ceph-15.2.2-systemd-unit.patch b/sys-cluster/ceph/files/ceph-15.2.2-systemd-unit.patch deleted file mode 100644 index fdd3a6ac2ac7..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.2-systemd-unit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur ceph-15.2.2/systemd/ceph-osd@.service.in ceph-15.2.2.af/systemd/ceph-osd@.service.in ---- ceph-15.2.2/systemd/ceph-osd@.service.in 2020-05-18 16:25:12.000000000 +0000 -+++ ceph-15.2.2.af/systemd/ceph-osd@.service.in 2020-05-21 21:20:58.318655944 +0000 -@@ -10,7 +10,7 @@ - EnvironmentFile=-@SYSTEMD_ENV_FILE@ - Environment=CLUSTER=ceph - ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph --ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i -+ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i - ExecReload=/bin/kill -HUP $MAINPID - LockPersonality=true - MemoryDenyWriteExecute=true diff --git a/sys-cluster/ceph/files/ceph-15.2.4-system-uring.patch b/sys-cluster/ceph/files/ceph-15.2.4-system-uring.patch deleted file mode 100644 index 64df81bf97b5..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.4-system-uring.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt -index 760244b9b4..7f83923671 100644 ---- a/src/os/CMakeLists.txt -+++ b/src/os/CMakeLists.txt -@@ -134,27 +134,6 @@ if(WITH_EVENTTRACE) - endif() - - if(WITH_LIBURING) -- include(ExternalProject) -- if("${CMAKE_GENERATOR}" MATCHES "Make") -- set(make_cmd "$(MAKE)") -- else() -- set(make_cmd "make") -- endif() -- ExternalProject_Add(liburing_ext -- DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/ -- GIT_REPOSITORY http://git.kernel.dk/liburing -- GIT_TAG "4e360f71131918c36774f51688e5c65dea8d43f2" -- SOURCE_DIR ${CMAKE_BINARY_DIR}/src/liburing -- CONFIGURE_COMMAND <SOURCE_DIR>/configure -- BUILD_COMMAND env CC=${CMAKE_C_COMPILER} ${make_cmd} -C src -s -- BUILD_IN_SOURCE 1 -- INSTALL_COMMAND "") -- unset(make_cmd) -- add_library(liburing STATIC IMPORTED GLOBAL) -- add_dependencies(liburing liburing_ext) -- set_target_properties(liburing PROPERTIES -- IMPORTED_LINK_INTERFACE_LANGUAGES "C" -- IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/src/liburing/src/liburing.a") -- target_link_libraries(os liburing) -- target_include_directories(os SYSTEM PRIVATE "${CMAKE_BINARY_DIR}/src/liburing/src/include") -+ pkg_check_modules(LIBURING REQUIRED IMPORTED_TARGET liburing) -+ target_link_libraries(os uring) - endif(WITH_LIBURING) -diff --git a/src/os/bluestore/io_uring.cc b/src/os/bluestore/io_uring.cc -index 54fa0f9535..4ba83cf172 100644 ---- a/src/os/bluestore/io_uring.cc -+++ b/src/os/bluestore/io_uring.cc -@@ -7,6 +7,8 @@ - - #include "liburing.h" - #include <sys/epoll.h> -+#include <unistd.h> -+#include <sys/syscall.h> - - /* Options */ - -@@ -134,8 +136,7 @@ int ioring_queue_t::init(std::vector<int> &fds) - if (ret < 0) - return ret; - -- ret = io_uring_register(d->io_uring.ring_fd, IORING_REGISTER_FILES, -- &fds[0], fds.size()); -+ ret = io_uring_register_files(&d->io_uring, &fds[0], fds.size()); - if (ret < 0) { - ret = -errno; - goto close_ring_fd; -@@ -214,7 +215,7 @@ bool ioring_queue_t::supported() - struct io_uring_params p; - - memset(&p, 0, sizeof(p)); -- int fd = io_uring_setup(16, &p); -+ int fd = syscall(SYS_io_uring_setup, 16, &p); - if (fd < 0) - return false; - diff --git a/sys-cluster/ceph/files/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch b/sys-cluster/ceph/files/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch deleted file mode 100644 index e9439a630185..000000000000 --- a/sys-cluster/ceph/files/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc -index e3064d2a21..c86b19da6c 100644 ---- a/src/compressor/zlib/ZlibCompressor.cc -+++ b/src/compressor/zlib/ZlibCompressor.cc -@@ -107,7 +107,7 @@ int ZlibCompressor::zlib_compress(const bufferlist &in, bufferlist &out) - return 0; - } - --#if __x86_64__ && defined(HAVE_BETTER_YASM_ELF64) -+#if __x86_64__ && defined(HAVE_BETTER_YASM_ELF64) && defined(HAVE_INTEL_SSE4_1) - int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out) - { - int ret; -@@ -167,7 +167,7 @@ int ZlibCompressor::compress(const bufferlist &in, bufferlist &out) - if (qat_enabled) - return qat_accel.compress(in, out); - #endif --#if __x86_64__ && defined(HAVE_BETTER_YASM_ELF64) -+#if __x86_64__ && defined(HAVE_BETTER_YASM_ELF64) && defined(HAVE_INTEL_SSE4_1) - if (isal_enabled) - return isal_compress(in, out); - else diff --git a/sys-cluster/ceph/files/ceph.initd-r12 b/sys-cluster/ceph/files/ceph.initd-r12 deleted file mode 100644 index 4a90e3c3f984..000000000000 --- a/sys-cluster/ceph/files/ceph.initd-r12 +++ /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/ceph}" -: "${stderr:=/var/log/ceph/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: |