commit: 5ae443701f3ac7d74af946097041380e9a8e2014 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Thu May 5 22:48:31 2022 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu May 5 22:51:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae44370
sys-cluster/ceph: Fix rados-classes path (bug #842822) With newer versions of cmake, CMAKE_INSTALL_LIBDIR is no longer an absolute path. This made the search path for the rados-classes be a relative path, which did not work. Switch to using CMAKE_INSTALL_FULL_LIBDIR instead. Closes: https://bugs.gentoo.org/842822 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> .../ceph/{ceph-17.2.0-r1.ebuild => ceph-17.2.0-r2.ebuild} | 1 + sys-cluster/ceph/files/ceph-17.2.0-osd_class_dir.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sys-cluster/ceph/ceph-17.2.0-r1.ebuild b/sys-cluster/ceph/ceph-17.2.0-r2.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-17.2.0-r1.ebuild rename to sys-cluster/ceph/ceph-17.2.0-r2.ebuild index 17629a190fe3..6254678f5431 100644 --- a/sys-cluster/ceph/ceph-17.2.0-r1.ebuild +++ b/sys-cluster/ceph/ceph-17.2.0-r2.ebuild @@ -213,6 +213,7 @@ PATCHES=( "${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" ) check-reqs_export_vars() { diff --git a/sys-cluster/ceph/files/ceph-17.2.0-osd_class_dir.patch b/sys-cluster/ceph/files/ceph-17.2.0-osd_class_dir.patch new file mode 100644 index 000000000000..2f6afc32cbc1 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-osd_class_dir.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/options/osd.yaml.in b/src/common/options/osd.yaml.in +index 8360e4a9223..e176fd37e06 100644 +--- a/src/common/options/osd.yaml.in ++++ b/src/common/options/osd.yaml.in +@@ -451,7 +451,7 @@ options: + - name: osd_class_dir + type: str + level: advanced +- default: @CMAKE_INSTALL_LIBDIR@/rados-classes ++ default: @CMAKE_INSTALL_FULL_LIBDIR@/rados-classes + fmt_desc: The class path for RADOS class plug-ins. + with_legacy: true + - name: osd_open_classes_on_start
