From: Patrick McLean Date: Fri, 3 Apr 2020 01:39:50 +0000 (-0700) Subject: sys-cluster/ceph-15.2.0: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=62184dacaf82fec96502225fbd61935d845b2241;p=gentoo.git sys-cluster/ceph-15.2.0: Version bump Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Patrick McLean --- diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index f6b72a26254e..68f01e592215 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,3 +1,4 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1 DIST ceph-14.2.8.tar.gz 128415417 BLAKE2B bb3644938106aaefe17d29fd6adc8568a35e6aef799da048add5ecebb6fb0128a8575eba1f5ecc2f33f33caf2130619e5b6979a6291566e0971976d8da0e8387 SHA512 38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a +DIST ceph-15.2.0.tar.gz 147445869 BLAKE2B 266bcffd702b46482316f59a9a071bdb9e1f9fc01a87f2f603995fe85d124722a8652aa3086bf3642d395a7f19652a0ce48496ee044a9b8f7e1f59643b48198e SHA512 07a3ff2ccf1a3abac652ff8c5f1611e7c628fcedcb280adc6cd49792b46fa50c7c29437dc57c2c4a6af708a6833abf8c1a386ef2142d30bd5e1f214ba7aec4f2 diff --git a/sys-cluster/ceph/ceph-14.2.8.ebuild b/sys-cluster/ceph/ceph-14.2.8.ebuild index 287059ae8ea1..95abd364b0f5 100644 --- a/sys-cluster/ceph/ceph-14.2.8.ebuild +++ b/sys-cluster/ceph/ceph-14.2.8.ebuild @@ -28,9 +28,9 @@ SLOT="0" CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) -IUSE="babeltrace +cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" -IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs system-boost" -IUSE+=" systemd +tcmalloc test xfs zfs" +IUSE="babeltrace +cephfs custom-cflags dpdk fuse grafana jemalloc kerberos ldap" +IUSE+=" libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs" +IUSE+=" system-boost systemd +tcmalloc test xfs zfs" IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" COMMON_DEPEND=" @@ -268,6 +268,7 @@ ceph_src_configure() { } src_configure() { + use custom-cflags || strip-flags ceph_src_configure } diff --git a/sys-cluster/ceph/ceph-15.2.0.ebuild b/sys-cluster/ceph/ceph-15.2.0.ebuild new file mode 100644 index 000000000000..67e9df32dd59 --- /dev/null +++ b/sys-cluster/ceph/ceph-15.2.0.ebuild @@ -0,0 +1,385 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) +CMAKE_MAKEFILE_GENERATOR=emake + +DISTUTILS_OPTIONAL=1 + +inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ + multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \ + systemd + +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="~amd64" +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 dpdk fuse grafana jemalloc kafka kerberos ldap + libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk static-libs + system-boost systemd +tcmalloc test uring xfs zfs" +IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +COMMON_DEPEND=" + acct-group/ceph + acct-user/ceph + virtual/libudev:= + app-arch/bzip2:=[static-libs?] + app-arch/lz4:=[static-libs?] + app-arch/snappy:=[static-libs(-)?] + app-arch/zstd:=[static-libs?] + app-shells/bash:0 + app-misc/jq:=[static-libs?] + dev-libs/crypto++:=[static-libs?] + dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] + dev-libs/libaio:=[static-libs?] + dev-libs/libnl:3=[static-libs?] + dev-libs/libxml2:=[static-libs?] + dev-libs/xmlsec:=[!openssl?,!libressl?,static-libs?] + dev-libs/yaml-cpp:=[static-libs?] + dev-libs/nss:= + dev-libs/protobuf:=[static-libs?] + net-dns/c-ares:=[static-libs?] + net-libs/gnutls:=[static-libs?] + sys-auth/oath-toolkit:= + sys-apps/coreutils + sys-apps/grep + sys-apps/hwloc:=[static-libs?] + sys-apps/keyutils:=[static-libs?] + sys-apps/util-linux:=[static-libs?] + sys-apps/sed + sys-apps/util-linux + sys-libs/libcap-ng:=[static-libs?] + sys-libs/ncurses:0=[static-libs?] + sys-libs/zlib:=[static-libs?] + sys-process/numactl:=[static-libs?] + x11-libs/libpciaccess:=[static-libs?] + babeltrace? ( dev-util/babeltrace ) + fuse? ( sys-fs/fuse:0=[static-libs?] ) + jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) + !jemalloc? ( >=dev-util/google-perftools-2.6.1:=[static-libs?] ) + kafka? ( dev-libs/librdkafka:=[static-libs?] ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:=[static-libs?] ) + lttng? ( dev-util/lttng-ust:= ) + rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) + radosgw? ( + dev-libs/expat:=[static-libs?] + openssl? ( + dev-libs/openssl:=[static-libs?] + net-misc/curl:=[curl_ssl_openssl,static-libs?] + ) + libressl? ( + dev-libs/libressl:=[static-libs?] + net-misc/curl:=[curl_ssl_libressl,static-libs?] + ) + ) + ssl? ( + openssl? ( dev-libs/openssl:=[static-libs?] ) + libressl? ( dev-libs/libressl:=[static-libs?] ) + ) + system-boost? ( =dev-libs/boost-1.72*[threads,context,python,static-libs?,${PYTHON_USEDEP}] ) + uring? ( sys-libs/liburing:=[static-libs?] ) + xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) + zfs? ( sys-fs/zfs:=[static-libs?] ) + ${PYTHON_DEPS} +" +BDEPEND=" + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) + app-arch/cpio + >=dev-util/cmake-3.5.0 + dev-python/cython[${PYTHON_USEDEP}] + dev-python/sphinx + dev-util/cunit + dev-util/gperf + dev-util/ragel + dev-util/valgrind + sys-apps/coreutils + sys-apps/findutils + sys-apps/grep + sys-apps/sed + 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="${COMMON_DEPEND} + net-misc/socat + sys-apps/gptfdisk + sys-block/parted + sys-fs/cryptsetup + sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lsscsi + virtual/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/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/scipy[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ) +" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ^^ ( openssl libressl ) + kafka? ( radosgw ) + rabbitmq? ( radosgw ) + mgr? ( cephfs ) + ?? ( jemalloc tcmalloc ) + rabbitmq? ( radosgw ) +" +RESTRICT="!test? ( test )" + +# the tests need root access +RESTRICT="test? ( userpriv )" + +# distribution tarball does not include everything needed for tests +RESTRICT+=" test" + +# 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.0-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-link-crc32-statically.patch" + "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" + "${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch" +) + +check-reqs_export_vars() { + if use amd64; then + CHECKREQS_DISK_BUILD="12G" + CHECKREQS_DISK_USR="460M" + else + CHECKREQS_DISK_BUILD="1400M" + CHECKREQS_DISK_USR="450M" + fi + + export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR +} + +pkg_pretend() { + check-reqs_export_vars + check-reqs_pkg_pretend +} + +pkg_setup() { + python_setup 'python3*' + check-reqs_export_vars + check-reqs_pkg_setup +} + +src_prepare() { + cmake-utils_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 -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ + src/bash_completion/CMakeLists.txt || die + + # 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_DPDK=$(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=$(usex static-libs '' 'ON' 'OFF') + -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") + -DWITH_SYSTEM_BOOST=$(usex system-boost) + -DBOOST_J=$(makeopts_jobs) + -DWITH_RDMA=OFF + -DWITH_TBB=OFF + -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) + -DEPYTHON_VERSION="${EPYTHON#python}" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + ) + 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 + + rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ + || die "failed to remove cmake cache" + + cmake-utils_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-utils_src_make VERBOSE=1 all + + # we have to do this here to prevent from building everything multiple times + python_copy_sources + python_foreach_impl python_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-utils_src_install + python_foreach_impl python_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/${PN}/stat + + fowners -R ceph:ceph /var/log/ceph + + newinitd "${FILESDIR}/rbdmap.initd" rbdmap + newinitd "${FILESDIR}/${PN}.initd-r12" ${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 + + readme.gentoo_create_doc + + python_setup 'python3*' + + # 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 +} 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 new file mode 100644 index 000000000000..097639c1bb79 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-15.2.0-no-virtualenvs.patch @@ -0,0 +1,73 @@ +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.0-rocksdb-cmake.patch b/sys-cluster/ceph/files/ceph-15.2.0-rocksdb-cmake.patch new file mode 100644 index 000000000000..9b3d34858e76 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-15.2.0-rocksdb-cmake.patch @@ -0,0 +1,15 @@ +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/metadata.xml b/sys-cluster/ceph/metadata.xml index d69494c3b6dc..dcf0de05f77f 100644 --- a/sys-cluster/ceph/metadata.xml +++ b/sys-cluster/ceph/metadata.xml @@ -23,13 +23,18 @@ Enable SPDK user-mode storage driver toolkit Build fuse client Install grafana dashboards + Rados Gateway's pubsub support for Kafka push endpoint Add support for LTTng Build the ceph-mgr daemon Use dev-libs/nss for cryptography Use sys-process/numactl for numa support in rocksdb + Use dev-libs/openssl + Enable PMDK libraries Use rabbitmq-c to build rgw amqp push endpoint Add radosgw support + Enable librbd persistent write back cache Use system dev-libs/boost instead of the bundled one + Build with support for sys-libs/liburing Add xfs support Add zfs support