From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A67E915810F for ; Thu, 8 Jun 2023 00:07:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDCEEE08AC; Thu, 8 Jun 2023 00:07:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8ECEEE08AC for ; Thu, 8 Jun 2023 00:07:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59204335D71 for ; Thu, 8 Jun 2023 00:07:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B827A990 for ; Thu, 8 Jun 2023 00:07:22 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1686182810.42186b4b750f9d448eeba0946dbc22732895ed7d.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/Manifest sys-cluster/ceph/ceph-17.2.5-r6.ebuild sys-cluster/ceph/ceph-17.2.6-r2.ebuild sys-cluster/ceph/ceph-17.2.6-r3.ebuild sys-cluster/ceph/ceph-17.2.6-r4.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 42186b4b750f9d448eeba0946dbc22732895ed7d X-VCS-Branch: master Date: Thu, 8 Jun 2023 00:07:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da786e4e-0fb2-43fe-ab4d-7506d7bdf0e6 X-Archives-Hash: dc26caac277ee0c9de3cb6c32461637d commit: 42186b4b750f9d448eeba0946dbc22732895ed7d Author: Patrick McLean gentoo org> AuthorDate: Thu Jun 8 00:06:50 2023 +0000 Commit: Patrick McLean gentoo org> CommitDate: Thu Jun 8 00:06:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42186b4b sys-cluster/ceph: Revbump, remove leveldb dep again, drop old Signed-off-by: Patrick McLean gentoo.org> sys-cluster/ceph/Manifest | 2 - sys-cluster/ceph/ceph-17.2.5-r6.ebuild | 480 --------------------- sys-cluster/ceph/ceph-17.2.6-r2.ebuild | 480 --------------------- ...ceph-17.2.6-r3.ebuild => ceph-17.2.6-r4.ebuild} | 1 - 4 files changed, 963 deletions(-) diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index a229700775f4..c6a19a4f4244 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,5 +1,3 @@ DIST ceph-16.2.13.tar.gz 157213576 BLAKE2B cc319ff67f6320c101341d7bbca0d49630fd6d4a5ed48b34e73a9e780ddf934adc35e3ff09e32115fe4b9a853bff9a85ca2c1e5e62d5596251d2dae535726a28 SHA512 39ec2bed1de0276f08bf93241f9fb275893041fd5f20ade75e68728107011ae5d01aed532d5afd8805951d09061a5a3d96c4311701c8897a29668f77126c19ab -DIST ceph-17.2.5.tar.gz 169004360 BLAKE2B b6d8df5f9b58de5e42fed5d16b1c82d2178297f8bb1b6cf9c42ff55d6a5b2e20fe413feeab038738f62342576ef59fff7091b87648c10cf71401377b0ffa5dc8 SHA512 10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e1268eed9e788fe32794d137f6af81abd6a2aeaee39cef44d2c45234a15cc6020 DIST ceph-17.2.6.tar.gz 168093221 BLAKE2B f79efce9bd7f485b43ae1b4da94a1d9fb3753003f34535e93c80e480ffeaaf054d371f75bca72402da5f9dd460aafa820bb2af550d213bdbcca74aa939180431 SHA512 dca9aea2ce210c15fcc34cb06a5dc5b4488ffa36d684166d47ebd87e48b54b6fee0882e1c67007a780e1c25754e9bc6e760cc10f60ea1183263f8504ef2dbd9b -DIST ceph-xsimd-17.2.5.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33 DIST ceph-xsimd-17.2.6.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33 diff --git a/sys-cluster/ceph/ceph-17.2.5-r6.ebuild b/sys-cluster/ceph/ceph-17.2.5-r6.ebuild deleted file mode 100644 index 95be155b4526..000000000000 --- a/sys-cluster/ceph/ceph-17.2.5-r6.ebuild +++ /dev/null @@ -1,480 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -LUA_COMPAT=( lua5-{3..4} ) - -inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ - python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles - -XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2" -SRC_URI=" - https://download.ceph.com/tarballs/${P}.tar.gz - parquet? ( https://github.com/xtensor-stack/xsimd/archive/${XSIMD_HASH}.tar.gz -> ceph-xsimd-${PV}.tar.gz ) -" -KEYWORDS="amd64 ~arm64" - -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=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3) - -IUSE=" - babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana - jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq - +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost - systemd +tcmalloc test +uring xfs zbd zfs -" - -IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -DEPEND=" - ${LUA_DEPS} - ${PYTHON_DEPS} - acct-group/ceph - acct-user/ceph - virtual/libudev:= - app-arch/bzip2:= - app-arch/lz4:= - app-arch/snappy:= - >=app-arch/snappy-1.1.9-r1 - app-arch/zstd:= - app-shells/bash:0 - app-misc/jq:= - dev-libs/crypto++:= - dev-cpp/gflags:= - dev-lang/jsonnet:= - dev-libs/libaio:= - >=dev-libs/libfmt-6.2.1:= - =dev-util/google-perftools-2.6.1:= ) - jaeger? ( - dev-cpp/nlohmann_json:= - dev-cpp/opentelemetry-cpp:=[jaeger] - ) - kafka? ( dev-libs/librdkafka:= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lttng? ( dev-util/lttng-ust:= ) - parquet? ( dev-libs/re2:= ) - pmdk? ( >=dev-libs/pmdk-1.10.0:= ) - rabbitmq? ( net-libs/rabbitmq-c:= ) - radosgw? ( - dev-libs/icu:= - dev-libs/expat:= - net-misc/curl:=[curl_ssl_openssl] - ) - rbd-rwl? ( dev-libs/pmdk:= ) - rdma? ( sys-cluster/rdma-core:= ) - spdk? ( dev-util/cunit ) - sqlite? ( dev-db/sqlite:= ) - system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] ) - uring? ( sys-libs/liburing:= ) - xfs? ( sys-fs/xfsprogs:= ) - zbd? ( sys-block/libzbd:= ) - zfs? ( sys-fs/zfs:= ) -" -BDEPEND=" - amd64? ( dev-lang/nasm ) - 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/gperf - dev-util/ragel - dev-util/valgrind - sys-apps/coreutils - sys-apps/grep - sys-apps/util-linux - sys-apps/which - sys-devel/bc - sys-devel/patch - virtual/pkgconfig - jaeger? ( - sys-devel/bison - sys-devel/flex - ) - test? ( - dev-util/cunit - 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} - 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/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/routes[${PYTHON_USEDEP}] - diskprediction? ( - >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] - ) - sci-libs/scikit-learn[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ${LUA_REQUIRED_USE} - ?? ( jemalloc tcmalloc ) - diskprediction? ( mgr ) - kafka? ( radosgw ) - mgr? ( cephfs ) - rabbitmq? ( radosgw ) - rgw-lua? ( radosgw ) -" - -RESTRICT=" - !test? ( test ) -" - -# tests need root access, and network access -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-16.2.2-cflags.patch" - "${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch" - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" - "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" - "${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch" - "${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch" - "${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch" - "${FILESDIR}/ceph-16.2.0-liburing.patch" - "${FILESDIR}/ceph-17.2.0-cyclic-deps.patch" - "${FILESDIR}/ceph-17.2.0-pybind-boost-1.74.patch" - "${FILESDIR}/ceph-17.2.0-findre2.patch" - "${FILESDIR}/ceph-17.2.0-install-dbstore.patch" - "${FILESDIR}/ceph-17.2.0-deprecated-boost.patch" - "${FILESDIR}/ceph-17.2.0-system-opentelemetry.patch" - "${FILESDIR}/ceph-17.2.0-fuse3.patch" - "${FILESDIR}/ceph-17.2.0-osd_class_dir.patch" - "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" - "${FILESDIR}/ceph-17.2.3-flags.patch" - "${FILESDIR}/ceph-17.2.4-cyclic-deps.patch" - # https://bugs.gentoo.org/866165 - "${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" - "${FILESDIR}/ceph-17.2.5-gcc13.patch" - "${FILESDIR}/ceph-17.2.5-gcc13-deux.patch" - "${FILESDIR}/ceph-17.2.5-boost-1.81.patch" - # https://bugs.gentoo.org/901403 - "${FILESDIR}/ceph-17.2.5-link-boost-context.patch" -) - -check-reqs_export_vars() { - CHECKREQS_DISK_BUILD="6G" - - if use system-boost; then - CHECKREQS_DISK_USR="350M" - else - CHECKREQS_DISK_USR="510M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup - lua_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 - - if ! use systemd; then - find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \ - | xargs --null sed \ - -e '/^from ceph_volume.systemd import systemctl/ d' \ - -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 - - # force lua version to use selected version - local lua_version - lua_version=$(ver_cut 1-2 $(lua_get_version)) - sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \ - -i src/CMakeLists.txt - - if use spdk; then - # https://bugs.gentoo.org/871942 - sed -i 's/[#]ifndef HAVE_ARC4RANDOM/#if 0/' src/spdk/lib/iscsi/iscsi.c || die - fi - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t || die -} - -ceph_src_configure() { - local mycmakeargs=( - -DWITH_BABELTRACE:BOOL=$(usex babeltrace) - -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) - -DWITH_CEPHFS:BOOL=$(usex cephfs) - -DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs) - -DWITH_DPDK:BOOL=$(usex dpdk) - -DWITH_SPDK:BOOL=$(usex spdk) - -DWITH_FUSE:BOOL=$(usex fuse) - -DWITH_LTTNG:BOOL=$(usex lttng) - -DWITH_GSSAPI:BOOL=$(usex kerberos) - -DWITH_GRAFANA:BOOL=$(usex grafana) - -DWITH_MGR:BOOL=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF - -DWITH_OPENLDAP:BOOL=$(usex ldap) - -DWITH_PYTHON3:STRING=3 - -DWITH_RADOSGW:BOOL=$(usex radosgw) - -DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq) - -DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka) - -DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO") - -DWITH_RBD_RWL:BOOL=$(usex rbd-rwl) - -DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd) - -DWITH_SYSTEMD:BOOL=$(usex systemd) - -DWITH_TESTS:BOOL=$(usex test) - -DWITH_LIBURING:BOOL=$(usex uring) - -DWITH_SYSTEM_LIBURING:BOOL=$(usex uring) - -DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite) - -DWITH_XFS:BOOL=$(usex xfs) - -DWITH_ZBD:BOOL=$(usex zbd) - -DWITH_ZFS:BOOL=$(usex zfs) - -DENABLE_SHARED:BOOL=ON - -DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl '')") - -DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost) - -DWITH_SYSTEM_ROCKSDB:BOOL=ON - -DWITH_SYSTEM_ZSTD:BOOL=ON - -DWITH_RDMA:BOOL=$(usex rdma) - -DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc" - -Wno-dev - ) - - # this breaks when re-configuring for python impl - if [[ ${EBUILD_PHASE} == configure ]]; then - mycmakeargs+=( - -DWITH_JAEGER:BOOL=$(usex jaeger) - -DWITH_RADOSGW_SELECT_PARQUET:BOOL=$(usex parquet) - ) - else - mycmakeargs+=( - -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF - -DWITH_JAEGER:BOOL=OFF - # don't want to warn about unused CLI when reconfiguring for python - -DCMAKE_WARN_UNUSED_CLI:BOOL=OFF - ) - fi - - # conditionally used cmake args - use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) ) - use systemd && mycmakeargs+=( -DSYSTEMD_SYSTEM_UNIT_DIR:PATH=$(systemd_get_systemunitdir) ) - - if use amd64 || use x86; then - local flag - for flag in "${CPU_FLAGS_X86[@]}"; do - case "${flag}" in - avx*) - local var=${flag%f} - mycmakeargs+=( - "-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})" - ) - ;; - *) mycmakeargs+=( - "-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})" - );; - esac - 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" - - # hopefully this will not be necessary in the next release - use parquet && export ARROW_XSIMD_URL="file:///${DISTDIR}/ceph-xsimd-${PV}.tar.gz" - - 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 -} - -src_compile() { - cmake_build all - - # we have to do this here to prevent from building everything multiple times - python_copy_sources - python_foreach_impl python_compile -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - ceph_src_configure - - cmake_build src/pybind/CMakeFiles/cython_modules -} - -src_install() { - python_foreach_impl python_install - - python_setup - cmake_src_install - python_optimize - - 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-r14" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - insinto /etc/sudoers.d - doins sudoers.d/* - - 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 - - # 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}}" -} - -python_install() { - local CMAKE_USE_DIR="${S}" - DESTDIR="${ED}" cmake_build src/pybind/install - - python_optimize -} - -pkg_postinst() { - readme.gentoo_print_elog - tmpfiles_process ${PN}.conf - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-cluster/ceph/ceph-17.2.6-r2.ebuild b/sys-cluster/ceph/ceph-17.2.6-r2.ebuild deleted file mode 100644 index a28df53b6173..000000000000 --- a/sys-cluster/ceph/ceph-17.2.6-r2.ebuild +++ /dev/null @@ -1,480 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -LUA_COMPAT=( lua5-{3..4} ) - -inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ - python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles - -XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2" -SRC_URI=" - https://download.ceph.com/tarballs/${P}.tar.gz - parquet? ( https://github.com/xtensor-stack/xsimd/archive/${XSIMD_HASH}.tar.gz -> ceph-xsimd-${PV}.tar.gz ) -" -KEYWORDS="~amd64 ~arm64" - -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=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3) - -IUSE=" - babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana - jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq - +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost - systemd +tcmalloc test +uring xfs zbd zfs -" - -IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -DEPEND=" - ${LUA_DEPS} - ${PYTHON_DEPS} - acct-group/ceph - acct-user/ceph - virtual/libudev:= - app-arch/bzip2:= - app-arch/lz4:= - app-arch/snappy:= - >=app-arch/snappy-1.1.9-r1 - app-arch/zstd:= - app-shells/bash:0 - app-misc/jq:= - dev-libs/crypto++:= - dev-cpp/gflags:= - dev-lang/jsonnet:= - =dev-libs/libfmt-6.2.1:= - =dev-util/google-perftools-2.6.1:= ) - jaeger? ( - dev-cpp/nlohmann_json:= - dev-cpp/opentelemetry-cpp:=[jaeger] - ) - kafka? ( dev-libs/librdkafka:= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lttng? ( dev-util/lttng-ust:= ) - parquet? ( dev-libs/re2:= ) - pmdk? ( >=dev-libs/pmdk-1.10.0:= ) - rabbitmq? ( net-libs/rabbitmq-c:= ) - radosgw? ( - dev-libs/icu:= - dev-libs/expat:= - net-misc/curl:=[curl_ssl_openssl] - ) - rbd-rwl? ( dev-libs/pmdk:= ) - rdma? ( sys-cluster/rdma-core:= ) - spdk? ( dev-util/cunit ) - sqlite? ( dev-db/sqlite:= ) - system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] ) - uring? ( sys-libs/liburing:= ) - xfs? ( sys-fs/xfsprogs:= ) - zbd? ( sys-block/libzbd:= ) - zfs? ( sys-fs/zfs:= ) -" -BDEPEND=" - amd64? ( dev-lang/nasm ) - 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/gperf - dev-util/ragel - dev-util/valgrind - sys-apps/coreutils - sys-apps/grep - sys-apps/util-linux - sys-apps/which - sys-devel/bc - sys-devel/patch - virtual/pkgconfig - jaeger? ( - sys-devel/bison - sys-devel/flex - ) - test? ( - dev-util/cunit - 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} - 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/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/routes[${PYTHON_USEDEP}] - diskprediction? ( - >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] - ) - sci-libs/scikit-learn[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ${LUA_REQUIRED_USE} - ?? ( jemalloc tcmalloc ) - diskprediction? ( mgr ) - kafka? ( radosgw ) - mgr? ( cephfs ) - rabbitmq? ( radosgw ) - rgw-lua? ( radosgw ) -" - -RESTRICT=" - !test? ( test ) -" - -# tests need root access, and network access -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-16.2.2-cflags.patch" - "${FILESDIR}/ceph-17.2.1-no-virtualenvs.patch" - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" - "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" - "${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch" - "${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch" - "${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch" - "${FILESDIR}/ceph-16.2.0-liburing.patch" - "${FILESDIR}/ceph-17.2.0-cyclic-deps.patch" - "${FILESDIR}/ceph-17.2.0-pybind-boost-1.74.patch" - "${FILESDIR}/ceph-17.2.0-findre2.patch" - "${FILESDIR}/ceph-17.2.0-install-dbstore.patch" - "${FILESDIR}/ceph-17.2.0-deprecated-boost.patch" - "${FILESDIR}/ceph-17.2.0-system-opentelemetry.patch" - "${FILESDIR}/ceph-17.2.0-fuse3.patch" - "${FILESDIR}/ceph-17.2.0-osd_class_dir.patch" - "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" - "${FILESDIR}/ceph-17.2.3-flags.patch" - "${FILESDIR}/ceph-17.2.4-cyclic-deps.patch" - # https://bugs.gentoo.org/866165 - "${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" - "${FILESDIR}/ceph-17.2.5-gcc13-deux.patch" - "${FILESDIR}/ceph-17.2.5-boost-1.81.patch" - # https://bugs.gentoo.org/901403 - "${FILESDIR}/ceph-17.2.6-link-boost-context.patch" -) - -check-reqs_export_vars() { - CHECKREQS_DISK_BUILD="6G" - - if use system-boost; then - CHECKREQS_DISK_USR="350M" - else - CHECKREQS_DISK_USR="510M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup - lua_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 - - if ! use systemd; then - find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \ - | xargs --null sed \ - -e '/^from ceph_volume.systemd import systemctl/ d' \ - -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 - - # force lua version to use selected version - local lua_version - lua_version=$(ver_cut 1-2 $(lua_get_version)) - sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \ - -i src/CMakeLists.txt - - if use spdk; then - # https://bugs.gentoo.org/871942 - sed -i 's/[#]ifndef HAVE_ARC4RANDOM/#if 0/' src/spdk/lib/iscsi/iscsi.c || die - fi - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t || die -} - -ceph_src_configure() { - local mycmakeargs=( - -DWITH_BABELTRACE:BOOL=$(usex babeltrace) - -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) - -DWITH_CEPHFS:BOOL=$(usex cephfs) - -DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs) - -DWITH_DPDK:BOOL=$(usex dpdk) - -DWITH_SPDK:BOOL=$(usex spdk) - -DWITH_FUSE:BOOL=$(usex fuse) - -DWITH_LTTNG:BOOL=$(usex lttng) - -DWITH_GSSAPI:BOOL=$(usex kerberos) - -DWITH_GRAFANA:BOOL=$(usex grafana) - -DWITH_MGR:BOOL=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF - -DWITH_OPENLDAP:BOOL=$(usex ldap) - -DWITH_PYTHON3:STRING=3 - -DWITH_RADOSGW:BOOL=$(usex radosgw) - -DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq) - -DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka) - -DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO") - -DWITH_RBD_RWL:BOOL=$(usex rbd-rwl) - -DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd) - -DWITH_SYSTEMD:BOOL=$(usex systemd) - -DWITH_TESTS:BOOL=$(usex test) - -DWITH_LIBURING:BOOL=$(usex uring) - -DWITH_SYSTEM_LIBURING:BOOL=$(usex uring) - -DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite) - -DWITH_XFS:BOOL=$(usex xfs) - -DWITH_ZBD:BOOL=$(usex zbd) - -DWITH_ZFS:BOOL=$(usex zfs) - -DENABLE_SHARED:BOOL=ON - -DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl '')") - -DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost) - -DWITH_SYSTEM_ROCKSDB:BOOL=ON - -DWITH_SYSTEM_ZSTD:BOOL=ON - -DWITH_RDMA:BOOL=$(usex rdma) - -DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc" - -Wno-dev - ) - - # this breaks when re-configuring for python impl - if [[ ${EBUILD_PHASE} == configure ]]; then - mycmakeargs+=( - -DWITH_JAEGER:BOOL=$(usex jaeger) - -DWITH_RADOSGW_SELECT_PARQUET:BOOL=$(usex parquet) - ) - else - mycmakeargs+=( - -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF - -DWITH_JAEGER:BOOL=OFF - # don't want to warn about unused CLI when reconfiguring for python - -DCMAKE_WARN_UNUSED_CLI:BOOL=OFF - ) - fi - - # conditionally used cmake args - use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) ) - use systemd && mycmakeargs+=( -DSYSTEMD_SYSTEM_UNIT_DIR:PATH=$(systemd_get_systemunitdir) ) - - if use amd64 || use x86; then - local flag - for flag in "${CPU_FLAGS_X86[@]}"; do - case "${flag}" in - avx*) - local var=${flag%f} - mycmakeargs+=( - "-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})" - ) - ;; - *) mycmakeargs+=( - "-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})" - );; - esac - 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" - - # hopefully this will not be necessary in the next release - use parquet && export ARROW_XSIMD_URL="file:///${DISTDIR}/ceph-xsimd-${PV}.tar.gz" - - 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 -} - -src_compile() { - cmake_build all - - # we have to do this here to prevent from building everything multiple times - python_copy_sources - python_foreach_impl python_compile -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - ceph_src_configure - - cmake_build src/pybind/CMakeFiles/cython_modules -} - -src_install() { - python_foreach_impl python_install - - python_setup - cmake_src_install - python_optimize - - 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-r14" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - insinto /etc/sudoers.d - doins sudoers.d/* - - 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 - - # 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}}" -} - -python_install() { - local CMAKE_USE_DIR="${S}" - DESTDIR="${ED}" cmake_build src/pybind/install - - python_optimize -} - -pkg_postinst() { - readme.gentoo_print_elog - tmpfiles_process ${PN}.conf - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-cluster/ceph/ceph-17.2.6-r3.ebuild b/sys-cluster/ceph/ceph-17.2.6-r4.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-17.2.6-r3.ebuild rename to sys-cluster/ceph/ceph-17.2.6-r4.ebuild index 4a8bab4a7c63..db80979c753d 100644 --- a/sys-cluster/ceph/ceph-17.2.6-r3.ebuild +++ b/sys-cluster/ceph/ceph-17.2.6-r4.ebuild @@ -51,7 +51,6 @@ DEPEND=" dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= -