From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 64504158046 for ; Tue, 16 Sep 2025 14:59:06 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2E600340D8B for ; Tue, 16 Sep 2025 14:59:06 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2B28D110213; Tue, 16 Sep 2025 14:59:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 21A52110213 for ; Tue, 16 Sep 2025 14:59:05 +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 CB7B3340D8B for ; Tue, 16 Sep 2025 14:59:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C31916FA for ; Tue, 16 Sep 2025 14:59:03 +0000 (UTC) From: "Patrick Lauer" 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 Lauer" Message-ID: <1758034740.fd022549f4781a1b2e42d92457264b52dbf8748e.patrick@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-20.1.0-r1.ebuild sys-cluster/ceph/ceph-20.1.0.ebuild sys-cluster/ceph/files/ceph-20.1.0-nvmeof.patch sys-cluster/ceph/metadata.xml X-VCS-Directories: sys-cluster/ceph/ sys-cluster/ceph/files/ X-VCS-Committer: patrick X-VCS-Committer-Name: Patrick Lauer X-VCS-Revision: fd022549f4781a1b2e42d92457264b52dbf8748e X-VCS-Branch: master Date: Tue, 16 Sep 2025 14:59:03 +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: 16eda26d-7e85-4863-80fa-0750f2de2020 X-Archives-Hash: d275fa5829b8ae1f3b7772d35b1a654d commit: fd022549f4781a1b2e42d92457264b52dbf8748e Author: Patrick Lauer gentoo org> AuthorDate: Tue Sep 16 14:14:54 2025 +0000 Commit: Patrick Lauer gentoo org> CommitDate: Tue Sep 16 14:59:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd022549 sys-cluster/ceph: Enable NVMEoF bits in 20 Signed-off-by: Patrick Lauer gentoo.org> .../{ceph-20.1.0.ebuild => ceph-20.1.0-r1.ebuild} | 6 ++++- sys-cluster/ceph/files/ceph-20.1.0-nvmeof.patch | 30 ++++++++++++++++++++++ sys-cluster/ceph/metadata.xml | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/sys-cluster/ceph/ceph-20.1.0.ebuild b/sys-cluster/ceph/ceph-20.1.0-r1.ebuild similarity index 98% rename from sys-cluster/ceph/ceph-20.1.0.ebuild rename to sys-cluster/ceph/ceph-20.1.0-r1.ebuild index 93a77847c095..e41e2a5bbb41 100644 --- a/sys-cluster/ceph/ceph-20.1.0.ebuild +++ b/sys-cluster/ceph/ceph-20.1.0-r1.ebuild @@ -27,7 +27,7 @@ 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 + jemalloc jaeger kafka kerberos ldap lttng +mgr nvmeof +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua selinux +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd " @@ -90,6 +90,7 @@ DEPEND=" kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) + nvmeof? ( net-libs/grpc:= ) parquet? ( >=app-arch/lz4-1.10 dev-cpp/xsimd @@ -190,6 +191,7 @@ REQUIRED_USE=" mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw ) + nvmeof? ( spdk ) " RESTRICT=" @@ -226,6 +228,7 @@ PATCHES=( "${FILESDIR}/ceph-18.2.4-liburing.patch" "${FILESDIR}/ceph-18.2.4-spdk.patch" "${FILESDIR}/ceph-19.2.1-isa-l.patch" + "${FILESDIR}/ceph-20.1.0-nvmeof.patch" ) check-reqs_export_vars() { @@ -353,6 +356,7 @@ ceph_src_configure() { -DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON -Wno-dev -DCEPHADM_BUNDLED_DEPENDENCIES=none + -DWITH_NVMEOF_GATEWAY_MONITOR_CLIENT:BOOL=$(usex nvmeof) ) # this breaks when re-configuring for python impl diff --git a/sys-cluster/ceph/files/ceph-20.1.0-nvmeof.patch b/sys-cluster/ceph/files/ceph-20.1.0-nvmeof.patch new file mode 100644 index 000000000000..51baf42122c2 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-20.1.0-nvmeof.patch @@ -0,0 +1,30 @@ +--- a/src/CMakeLists.txt 2025-09-15 15:00:18.003748368 -0000 ++++ b/src/CMakeLists.txt 2025-09-15 15:04:40.923163569 -0000 +@@ -906,7 +906,7 @@ + + # NVMEOF GATEWAY MONITOR CLIENT + # Supported on RPM-based platforms only, depends on grpc devel libraries/tools +-if(EXISTS "/etc/redhat-release" OR EXISTS "/etc/fedora-release") ++if(EXISTS "/etc/redhat-release" OR EXISTS "/etc/fedora-release" OR EXISTS "/etc/gentoo-release") + option(WITH_NVMEOF_GATEWAY_MONITOR_CLIENT "build nvmeof gateway monitor client" ON) + else() + option(WITH_NVMEOF_GATEWAY_MONITOR_CLIENT "build nvmeof gateway monitor client" OFF) + + +--- a/src/CMakeLists.txt 2025-09-16 05:15:55.633004241 -0000 ++++ b/src/CMakeLists.txt 2025-09-16 13:24:29.640098498 -0000 +@@ -918,6 +918,14 @@ + # Looks for protobuf-config.cmake file installed by Protobuf's cmake installation. + option(protobuf_MODULE_COMPATIBLE TRUE) + find_package(Protobuf REQUIRED) ++ find_library (UPB_LIBRARIES NAMES upb) ++ if (UPB_LIBRARIES) ++ add_library(protobuf::libupb STATIC IMPORTED) ++ add_executable(protobuf::protoc-gen-upb IMPORTED) ++ add_executable(protobuf::protoc-gen-upbdefs IMPORTED) ++ add_executable(protobuf::protoc-gen-upb_minitable IMPORTED) ++ endif() ++ + + set(_REFLECTION grpc++_reflection) + if(CMAKE_CROSSCOMPILING) diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml index 10e8a6f85f00..8424107048aa 100644 --- a/sys-cluster/ceph/metadata.xml +++ b/sys-cluster/ceph/metadata.xml @@ -24,6 +24,7 @@ Rados Gateway's pubsub support for Kafka push endpoint Add support for LTTng Build the ceph-mgr daemon + Enable support for NVMEoF Support for s3 select on parquet objects Enable PMDK libraries Use rabbitmq-c to build rgw amqp push endpoint