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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C6361581FB for ; Sun, 1 Dec 2024 12:52:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F980E07F6; Sun, 1 Dec 2024 12:52:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 EF60FE07F6 for ; Sun, 1 Dec 2024 12:52:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 187E7342F8D for ; Sun, 1 Dec 2024 12:52:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C8921AB5 for ; Sun, 1 Dec 2024 12:52:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1733057435.38e68aa1b277ee64f64baa66711727ae4fa10a4c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-18.2.4-r2.ebuild sys-cluster/ceph/ceph-18.2.4-r3.ebuild sys-cluster/ceph/ceph-19.2.0-r1.ebuild sys-cluster/ceph/ceph-19.2.0-r2.ebuild sys-cluster/ceph/ceph-19.2.0.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 38e68aa1b277ee64f64baa66711727ae4fa10a4c X-VCS-Branch: master Date: Sun, 1 Dec 2024 12:52:19 +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: ffaa7219-c35f-4c77-8662-8eeb42358d58 X-Archives-Hash: 0a9e4979c76c28ecc254942da5583c6b commit: 38e68aa1b277ee64f64baa66711727ae4fa10a4c Author: Yiyang Wu gmail com> AuthorDate: Wed Aug 14 15:04:00 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 1 12:50:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e68aa1 sys-cluster/ceph: limit opentelemetry-cpp version sys-cluster/ceph[jaeger] depends on opentelemetry-cpp[jaeger] while opentelemetry-cpp removes jaeger from v1.10.0 in https://github.com/open-telemetry/opentelemetry-cpp/pull/2031 Remove 19.2.0 ebuild which should be replaced by its revision Signed-off-by: Yiyang Wu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38146 Signed-off-by: Sam James gentoo.org> ...ceph-18.2.4-r2.ebuild => ceph-18.2.4-r3.ebuild} | 2 +- ...ceph-19.2.0-r1.ebuild => ceph-19.2.0-r2.ebuild} | 2 +- sys-cluster/ceph/ceph-19.2.0.ebuild | 511 --------------------- 3 files changed, 2 insertions(+), 513 deletions(-) diff --git a/sys-cluster/ceph/ceph-18.2.4-r2.ebuild b/sys-cluster/ceph/ceph-18.2.4-r3.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-18.2.4-r2.ebuild rename to sys-cluster/ceph/ceph-18.2.4-r3.ebuild index 94b94cde3b06..345c800a98ba 100644 --- a/sys-cluster/ceph/ceph-18.2.4-r2.ebuild +++ b/sys-cluster/ceph/ceph-18.2.4-r3.ebuild @@ -83,7 +83,7 @@ DEPEND=" !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= - dev-cpp/opentelemetry-cpp:=[jaeger] + ~#include ~' src/mds/BoostUrlImpl.cc || die - - # everyone forgot to link to boost_url - sed -i -e 's~target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common~target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common boost_url~' src/CMakeLists.txt || die - sed -i -e 's/target_link_libraries(journal cls_journal_client)/target_link_libraries(journal cls_journal_client boost_url)/' src/journal/CMakeLists.txt || die - sed -i -e 's/${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})/${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} boost_url)/g' src/tools/cephfs/CMakeLists.txt || 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) - -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" - # use the bundled libfmt for now since they seem to constantly break their API - -DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON - -Wno-dev - -DCEPHADM_BUNDLED_DEPENDENCIES=none - ) - - # 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" - - # https://bugs.gentoo.org/927066 - filter-lto - - 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 - cmake_build cephadm -} - -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 - DESTDIR="${ED}" cmake_build src/cephadm/install - - python_optimize -} - -pkg_postinst() { - readme.gentoo_print_elog - tmpfiles_process ${PN}.conf - udev_reload -} - -pkg_postrm() { - udev_reload -}