diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /sys-cluster/ceph | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'sys-cluster/ceph')
15 files changed, 567 insertions, 330 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index bc318ac1624c..a164bc4fe028 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -27,10 +27,18 @@ AUX ceph-16.2.0-liburing.patch 1331 BLAKE2B 1f0e2e209cb827526b76e28f1334619c4d03 AUX ceph-16.2.0-rocksdb-cmake.patch 705 BLAKE2B d40371aa0163cd78dbe12b1db648f4884b762e2ec2485663aa5cda83aea2175c8ee9a6b1a54e5ed9d68fbfda8c0ee0ef7625a67d948b6259227e56fb0ee69b52 SHA512 0c974ea937644b98dde6f20f1cab9b39c73f7fd8cc0fa0991e05de2e0a39fe69dee60a981c0ae14386f8c0c5c4073d5c8573e3bd0fa47d58b754351329eda220 AUX ceph-16.2.0-spdk-tinfo.patch 344 BLAKE2B ea46ab83836ebc9ed96714e0ed3c3e8b00a221296ddf9b10a99eb5591740a844067078820d79ae784cdb600c97e2969e81c65a4fe3b958bcc9910f7cecb1a6fe SHA512 31b9ae63c8f1722e4834034ed04cfc9ab47665ecd8f24da356897b0c52787096acbfc9cccf600655938da0f9f39200c2470cdb087f389adba975b6d830e7228d AUX ceph-16.2.2-cflags.patch 540 BLAKE2B d7f7ce9e65d59b7a9594f4cd34091df8b496d03cedfa814a14165d51ec0daa38ad0124fbfa62d9ee7cf2895676248b14b45a38f310efb544e61e9672c58fb25d SHA512 d65b2b33f2e43169e5131ef3ca51617931fc3d362af8c79bef2baa2bbee6495729ee7a4fca4401a6be716283fcdf83511bdfb90e0c4b526b90e91c9c32591439 -AUX ceph-16.2.2-no-virtualenvs.patch 3355 BLAKE2B e18ed3f6fca434df58b41d10cd087a2109f85448d77ddc1c4e3058fce1ea010ad88b6bf8271afac05260b78bd30bc23ec35532fbd7d0076f2e1169348219c9f5 SHA512 9d8ebddec895f369bdeb37556af85142a4a6edd330b1c9a4340bcfd8b33c951bf243f76f16eb05f9b7acc2f61aaca2594134cd74f40c3ead4d9760a68cdce69c AUX ceph-16.2.2-system-zstd.patch 1501 BLAKE2B 6540822407802dacb43c4fd9c432b45ec747a77d6892f2193fe55cb09da90b035d7630bdf5f9ec6f49df5e351c1d38c96cd14e9ed180bee897f11413ba53ed64 SHA512 5e21e29b30ee67411e3631fa65d0dc8a7b232e582c995049b4e89ea709e87a42edbf5cd4bbe535e62aebb7c9509a85b92c62e0f9914b2d4ee197994e2665139a AUX ceph-16.2.7-no-virtualenvs.patch 3362 BLAKE2B 4ed9e3f2bc681f9b06071f11eaead2dc3571d45f3efbd27d83c78b38014d28ce4d37a01873dee56b88dd1fafac37a41e5454a4ba50f096c8e5d446108a714c7e SHA512 78ab25f3138832263892d357b160611cb5a13376fdb4d4197a2d052deaacf9ae4ae7776c0475e49bb685ac840f4ebc49bde678c3b952a964b5e88058e2aa51b8 AUX ceph-16.2.7-string-includes.patch 670 BLAKE2B 308a1434afc6c81def5b7ef43cfb6f1bd37b5b46c5a2591c0615b941cf80cb4814c090edb6805545c333355b4dcf55991bd2459572cd16e6b2d393f1fffe2c00 SHA512 c6e0d35aa2f6a8cb4c63b7cd7baa4909e0becd0ff09f7bb712fa53c62e3f5a26c0352066c1f4fe5186a69faccc8d902bf83fea7f2df0f5324d98cc90e546d627 +AUX ceph-17.2.0-cyclic-deps.patch 2202 BLAKE2B 14bfdada20b4d1a27308c42c4cadfe11060ccb6f8e2d84a744bd94b08f03fc810f53f2d7fdfdbd646c5d3c649ac7b64a32517d05169bd157ed0725c0fa722b43 SHA512 e1ef790fc62f03b2edb8a069b50848923f0b01b64777f0641cc76dfd7129a42b2d5eb5d778cd6e730e917ad90a325a6f51e4b1e3534a9231bfffefe488167e1d +AUX ceph-17.2.0-deprecated-boost.patch 2451 BLAKE2B 8fcf2f55a80840ef2452c45ea964aa375f1972dc441dcd5cdf4bcda9c4b69e179d98bfe0959be40994263823e715d0c8b1631e30cdb2d75144400543b07a3281 SHA512 505bb4e50ccc9d8fc7f1540950eaf59984204966b3faa60301034b80ee8f85ca1f45998ae99a8b960a288feac32bfd780e87db94839379c6b6343fc081a515ef +AUX ceph-17.2.0-findre2.patch 709 BLAKE2B b7b044e71206ada569fd64242256c85932ca3dc34d5be4520ce0d420838045ca26c5a7c8212762af217adf245b18197c1aa4f0bf69e8d80c3c330b0d40bccbb4 SHA512 990d70f656bb8a3a9904c7235a48622e0a2bbdf3b751b4bd8603b2078d549a7b6dcbdf204a88512c525c2a95dbaa0ac792aafa5cf565faf91a4417923e7ae57b +AUX ceph-17.2.0-fuse3.patch 301 BLAKE2B 54dd764be7e7d428c6db38d2c8b9d168598c3d4195e1f0f43073d259215dd8268e1bbf14d6586bcf6cb1bdd67a25e6742e74b1f16b4ceba7e6fad37af682b9c8 SHA512 143dcba141c01828a9672096b26bee817189b8fe742e6816e304eb4147015de2df5d74b474d1a5dde84f13e5e6060c17756a8a04e7d6894fb4894ed933b37b39 +AUX ceph-17.2.0-install-dbstore.patch 493 BLAKE2B e54ffbda69e86ba0b869f02b16055c89d93f58d680bc931c73aeccfb7efbc890b25f7d4f081f033531d4356faf55628e21ba81aeeb4acd907e437553d15ea10f SHA512 c13e73d0471a47bbcbc3c1b5ccdbf00eb72efa31530cafc54d15d8d1aa2da32465bf3a4c9a27568a3fcbfa1117e920c6b687cabf714fa9eedfd2a50a4d417613 +AUX ceph-17.2.0-no-virtualenvs.patch 2789 BLAKE2B 593f65b76f2b3560a2644bac8313c1f26b3fb0d45ef6284bffe9a976e324ce65423d8d07760f0ce394fa896fa3ba85c1e22be46c0d1bc37f303d2f3087df41d7 SHA512 931f035aab00edb8d4155b5e9cd88d6cafc2eb45a7c53a908bbbc09bf09f22656f0977ef1afb8f2e9a9faed188336b67af87121aa2147b81153db589d6b6634e +AUX ceph-17.2.0-osd_class_dir.patch 486 BLAKE2B 7d9e144ab40e5e2f73a1412a65b27ffda74bf742d8499845a8dd43d42b18294ca5da9feca6f7345be950cf98b9e30f654a7ed40e9b7159a0aa5fe4462d6b0197 SHA512 02b7b685655f7d7b11744fabea2cb342bf6564a7fe068b783769276b9604c1320b83daad7078190fd293b9dadf06e6f657db35125e28dfa9619aac2179150bd7 +AUX ceph-17.2.0-pybind-boost-1.74.patch 845 BLAKE2B b862b1abf61c0f5cc17964c86073a083b217f01ca5ae725bfe07ba13702e2d835bf8ccc4b5fae4b3138230b36722f4de0c8176811d6eefc1523e1fcb4848b744 SHA512 525b5df44f0de71ab0b2024c8bc0ccf98740a0befac4b032ae9a0fb6e2a05926d7171ae4b0af4ba32e71c9e04fe90aa192a2e3ae433242a62fa4e4efdc855321 +AUX ceph-17.2.0-system-opentelemetry.patch 705 BLAKE2B 0036ad8e7d2d8a707db5ea137cb47e9cb18d8e4d8923d3c8dc1306adca24fb30c029e03d76a281219ce34928b5ed6448aba4a98b2286a942eda2cf86fb0e5365 SHA512 d845ae2b9d31604d622dfb2993186ca1b3e37d3a5e88df8b4747c45b0f1913f4e092a5b0a2405ab228a57e6717bdf51c5458c66eab601eabdece4524085840e3 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300 @@ -47,11 +55,12 @@ AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde3 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad15d16690dcbd1511d1b506477845efc3ff7fbe713cf18fb8cfcc8c16707ad2a0f30159e3198ff82e57fbd2eb3cf2 SHA512 1c66661e1a39fa9151e95e33c390b810ffe269465d8785e2197cc15b8d83bd2edde77de48a8abd71a4da68cd5830ff14bcdf6b98fd17edabe85caeb1eca018d3 DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b -DIST ceph-16.2.6.tar.gz 156087762 BLAKE2B e2595d1a958200e4f1877e4597c53319a9eee2e95606ea1b3ba2966a0d17f1cfcf52e05cca59752cc6ac383e32d944c380920d111aec840631235aef273a4de1 SHA512 f01e29088ae566d4111c21b5d0c173ddb02badaa0d8272f7f1548eb8e66a95dc7052b3945d9fb342e6c97a65c57648fda394317340d1f4236a57af7580073658 DIST ceph-16.2.7.tar.gz 156621262 BLAKE2B 3c79cb1586e71927df4578fe7f3a13f4ab257a5e145b6bf76d942292cbca7bf32583350373f3d816f6d8f8700ee0f98a14f350c823b0eb89ffd7735acee7de63 SHA512 eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c +DIST ceph-17.2.0.tar.gz 168742006 BLAKE2B 15272da3471722936198f62b5ef7537d29bd944b35ef1552e87cf0f0f400a8be5fd1fa873494eb17ca71df9360d7ffa4fa20a6f1b1ba819520b180770a4e6299 SHA512 70b96e709f153f16069bec8346ea73812d699eaab91a012351d02addb3fd176b84fce32c3dae84fdf91d0ffe49f2bb258410b47caeee81d81a672b4dbd04cc7e +DIST ceph-xsimd-17.2.0.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33 EBUILD ceph-14.2.22-r1.ebuild 10507 BLAKE2B 3842903c666d0fcaf5eb928b2ebe744bdec3544a0383229f5d9d4eea3bf065b84eb079f93a78b6f711056d99f89eb1901e64c9544fa41a9580ad77963fc7a21e SHA512 93479bb2d5caeca95382bbc0f0a4e000949bd770d2ab948a08952f1ac71ae88d97ed40a6c04775690b8dac41ed7058849be3de538e8832e85c12575598fe2d33 EBUILD ceph-15.2.16.ebuild 10917 BLAKE2B c1b135b0cbdb9f390248ec861e9c196095cec4011f934fa859c39475483d815c6f369bf88e7d8ca21690f500e372d9707ae00084d3dcbdffc72e7e928c55a07e SHA512 281d6915a55ebe16619549f9bdee35ff4af0ffc68ef1360ec2c132a03a57d4361e7216f9b663486ebd77512aa563bdeb70d30e3feb8cd8e1c3a21c7a21277a43 -EBUILD ceph-16.2.6-r2.ebuild 12141 BLAKE2B aa706df24ed37c3ffcbe90dd625464f1a57be2fb1e32eb954305ee59099f85131b409d0b5a31d89819065b5bc2e35347afd398d218a96d3e5edf6b8b0e57be80 SHA512 dcc938affbefb452081c4c9859efa2d89f8bbe0a4ab8c6389ea9e2d477bd434263eb8649a6bf1d12da0faaff4103142c5c37cb4fba3109a7d09ba9575267e1de -EBUILD ceph-16.2.6-r4.ebuild 12208 BLAKE2B 7788ff778a0be9e7c3015c282b9354c4217b250d3719de7e1389d00862f17264d855038cc70acb62406000d69253ced4b9648a0e7c00b11da2b16b089d212426 SHA512 ab9d52b32fe1b36cab63dd1d77d0f1b6b949cc4a423664f43f6e70e4725f4039a674d5bea56ec1e203a688d396d7a9195a7bf700824d33fbb4f7ecf1c84a739e -EBUILD ceph-16.2.7.ebuild 12258 BLAKE2B 798f81ef38bd0954e763255b6d1bdf3e3f4c65907d6b544c258ac9e69d2b2fb69d805014fe9fe221ca17760f3068af80ea65b2c06e7d5591aeca0f1bed004738 SHA512 49ef8459cf11c3b75b6f4e2e73bc957d680320e166bb57aaf9ebe965477ca4a2691502c4dc53b390a5c5e24b37dddee40be06accc4ee91db8ac86f65a0a3a15a -MISC metadata.xml 2319 BLAKE2B ed789868b8ce45fcdfd0125b296511c109815fa86c92e36371e32450a84a2b2415d8dcbdcbf7858f34a8db412157ae1242b66ef533272e6fa432532a1cac7c65 SHA512 36c8dae7ef1dc91d6f60279a61db96f3712ecf8c7a5844b8389105f2a1f8008a8744556d1addde5a50321153727bf8cd51d07142eeebcc87ab2ee86335ebad26 +EBUILD ceph-16.2.7-r1.ebuild 12370 BLAKE2B 4e74d44c0d46f97640f678937eafa120c2e186dff56f83582e9b6dba06e952f6d79c0977d6ac4c121642c3ce8eec1b3bc180c93925282932f7ad30671bd2e783 SHA512 3f90ca8e5c6e1e3498deeee342d6f8ac7123420232aa502f147e2d0544033ec9d48d2d964db04a0fef3e42aba0c5e72c55ec6090d3b8fe9449872286d9925919 +EBUILD ceph-16.2.7.ebuild 12257 BLAKE2B 60c2b1f086b8a58331720f478319140b65d76e25cf6f975596cbece5830e7feb702e1ed0c4ab4a1dff5c929a132dd7e444fc943d623ded94bd7bbb8909a26726 SHA512 3e800a7651c94e848cd0c071ca16be87ea28f49dbb7ee2837817d435679c82f02488a259672678c5613c6c00b57cba1148f12e5aa58e58d03118c17fcce956c9 +EBUILD ceph-17.2.0-r2.ebuild 12384 BLAKE2B c7a9b24352909db12f0a888d9fa4b5ef7358020f97a0a420728a7bca07537b174fcb5cffc525b579bb9b22cd69c67d481e36e9f9f5b0afd152eb81b60b04fd1e SHA512 c927b1232b7f833904e24670f858fe81aa342cf7c8996ce54f905455467f8975b3960dbb0bbe2572d6d3d1e16da933bc6961c9660fb835b99652d390e13e8981 +MISC metadata.xml 2453 BLAKE2B 988cbe4fa5176fde46a503932a58555554e577a311180df706021ea67a8c861b82fbc476cc757c090ea4e753b519212a2cca8c0605921c4e121b770fd1cc61ea SHA512 14c25df4749cd86f82782f8e7cda587a0310e4cf28b6d4f8ac1fa4abee532d6d553f35fcfb8ab0393ce876d36a8fe2851408ad5eaaf5cf28834f03cf744ac6c1 diff --git a/sys-cluster/ceph/ceph-16.2.6-r4.ebuild b/sys-cluster/ceph/ceph-16.2.7-r1.ebuild index f33908a5f253..64fd34329764 100644 --- a/sys-cluster/ceph/ceph-16.2.6-r4.ebuild +++ b/sys-cluster/ceph/ceph-16.2.7-r1.ebuild @@ -1,26 +1,19 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{8..10} ) LUA_COMPAT=( lua5-3 ) CMAKE_MAKEFILE_GENERATOR=emake -inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ +inherit check-reqs bash-completion-r1 cmake python-r1 flag-o-matic \ lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \ - systemd tmpfiles multiprocessing + systemd tmpfiles -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 ~arm64 ~ppc64" -fi +SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" +KEYWORDS="~amd64 ~arm64 ~ppc64" DESCRIPTION="Ceph distributed filesystem" HOMEPAGE="https://ceph.com/" @@ -30,20 +23,24 @@ 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 +IUSE=" + babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq - +radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite +system-boost systemd - +tcmalloc test uring xfs zbd zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +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:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 @@ -56,6 +53,7 @@ DEPEND=" dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= + dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= @@ -65,11 +63,9 @@ DEPEND=" net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils - sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= - sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= @@ -78,7 +74,7 @@ DEPEND=" virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0= ) + fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) @@ -91,18 +87,17 @@ DEPEND=" radosgw? ( dev-libs/icu:= dev-libs/expat:= - dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) - ssl? ( dev-libs/openssl:= ) + rdma? ( sys-cluster/rdma-core:= ) + spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) - ${PYTHON_DEPS} " BDEPEND=" amd64? ( dev-lang/nasm ) @@ -112,13 +107,13 @@ BDEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/sphinx - dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed + sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch @@ -128,6 +123,7 @@ BDEPEND=" sys-devel/flex ) test? ( + dev-util/cunit dev-python/coverage[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] dev-python/requests-mock[${PYTHON_USEDEP}] @@ -183,13 +179,13 @@ REQUIRED_USE=" mgr? ( cephfs ) rabbitmq? ( radosgw ) " -RESTRICT="!test? ( test )" -# the tests need root access -RESTRICT="test? ( userpriv )" +RESTRICT=" + !test? ( test ) +" -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" +# tests need root access, and network access +RESTRICT+="test" # create a non-debug release CMAKE_BUILD_TYPE=RelWithDebInfo @@ -202,7 +198,7 @@ PATCHES=( "${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-16.2.2-no-virtualenvs.patch" + "${FILESDIR}/ceph-16.2.7-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-cython-0.29.patch" @@ -212,6 +208,8 @@ PATCHES=( "${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch" "${FILESDIR}/ceph-16.2.0-liburing.patch" "${FILESDIR}/ceph-16.2.2-system-zstd.patch" + "${FILESDIR}/ceph-16.2.7-string-includes.patch" + "${FILESDIR}/ceph-17.2.0-fuse3.patch" ) check-reqs_export_vars() { @@ -246,7 +244,8 @@ src_prepare() { | xargs --null sed -r \ -e 's|Boost::|boost_|g' \ -e 's|Boost_|boost_|g' \ - -e 's|[Bb]oost_boost|boost_system|g' -i || die + -e 's|[Bb]oost_boost|boost_system|g' \ + -i || die fi if ! use systemd; then @@ -268,78 +267,88 @@ src_prepare() { # force lua version to use selected version local lua_version lua_version=$(ver_cut 1-2 $(lua_get_version)) - sed -i "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" src/CMakeLists.txt + sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \ + -i src/CMakeLists.txt # 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_SPDK=$(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_RADOSGW_LUA_PACKAGES=$(usex rgw-lua "$(usex radosgw)" "NO") - -DWITH_RBD_RWL=$(usex rbd-rwl) - -DWITH_RBD_SSD_CACHE=$(usex rbd-ssd) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_LIBURING=$(usex uring) - -DWITH_SYSTEM_LIBURING=$(usex uring) - -DWITH_LIBCEPHSQLITE=$(usex sqlite) - -DWITH_XFS=$(usex xfs) - -DWITH_ZBD=$(usex zbd) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED="ON" - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_SYSTEM_ROCKSDB=ON - -DWITH_RDMA=OFF - -DWITH_TBB=OFF - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -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_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 - [[ ${EBUILD_PHASE} == configure ]] && mycmakeargs+=(-DWITH_JAEGER=$(usex jaeger)) + if [[ ${EBUILD_PHASE} == configure ]]; then + mycmakeargs+=( + -DWITH_JAEGER:BOOL=$(usex jaeger) + ) + else + mycmakeargs+=( + -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF + ) + fi + + # conditionally used cmake args + use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) ) + use systemd && mycmakeargs+=( -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=$(systemd_get_systemunitdir) ) if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do + local flag + for flag in "${CPU_FLAGS_X86[@]}"; do case "${flag}" in avx*) local var=${flag%f} - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_NASM_X64_${var^^}=1")") + mycmakeargs+=( + "-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})" + ) ;; - *) mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")");; + *) 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) + 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" @@ -357,6 +366,14 @@ src_configure() { ceph_src_configure } +src_compile() { + cmake_build VERBOSE=1 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 @@ -371,31 +388,16 @@ python_compile() { popd >/dev/null || die } -src_compile() { - cmake_build 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_src_install python_foreach_impl python_install + python_setup + cmake_src_install + find "${ED}" -name '*.la' -type f -delete || die exeinto /usr/$(get_libdir)/ceph @@ -423,12 +425,8 @@ src_install() { # 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" - + 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 @@ -436,8 +434,6 @@ src_install() { readme.gentoo_create_doc - python_setup - # bug #630232 sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ || die "sed failed" @@ -453,7 +449,17 @@ src_install() { dostrip -x "${rados_classes[@]#${ED}}" } +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 +} + pkg_postinst() { readme.gentoo_print_elog tmpfiles_process ${PN}.conf + udev_reload } diff --git a/sys-cluster/ceph/ceph-16.2.7.ebuild b/sys-cluster/ceph/ceph-16.2.7.ebuild index 341bcfa767c0..7a95b9398834 100644 --- a/sys-cluster/ceph/ceph-16.2.7.ebuild +++ b/sys-cluster/ceph/ceph-16.2.7.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="amd64 ~arm64 ~ppc64" fi DESCRIPTION="Ceph distributed filesystem" diff --git a/sys-cluster/ceph/ceph-16.2.6-r2.ebuild b/sys-cluster/ceph/ceph-17.2.0-r2.ebuild index 9e09341cd8f2..6254678f5431 100644 --- a/sys-cluster/ceph/ceph-16.2.6-r2.ebuild +++ b/sys-cluster/ceph/ceph-17.2.0-r2.ebuild @@ -1,26 +1,19 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_OPTIONAL=1 -LUA_COMPAT=( lua5-3 ) +PYTHON_COMPAT=( python3_{8..10} ) +LUA_COMPAT=( lua5-{3..4} ) -CMAKE_MAKEFILE_GENERATOR=emake +inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ + python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles -inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ - lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \ - systemd tmpfiles - -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 ~arm64 ~ppc64" -fi +SRC_URI=" + https://download.ceph.com/tarballs/${P}.tar.gz + parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-${PV}.tar.gz ) +" +KEYWORDS="~amd64 ~arm64" DESCRIPTION="Ceph distributed filesystem" HOMEPAGE="https://ceph.com/" @@ -30,20 +23,25 @@ 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 numa pmdk rabbitmq - +radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite system-boost systemd - +tcmalloc test uring xfs zbd zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" +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-1.1.9:= + app-arch/snappy:= + || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= @@ -51,25 +49,25 @@ DEPEND=" dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= - dev-libs/libfmt:= + >=dev-libs/libfmt-6.2.1:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= + dev-libs/libutf8proc:= + dev-libs/openssl:= <dev-libs/rocksdb-6.15:= + dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= - dev-libs/protobuf:= + dev-python/pyyaml[${PYTHON_USEDEP}] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils - sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= - sys-apps/sed - sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= @@ -77,31 +75,34 @@ DEPEND=" virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0= ) + fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) - jaeger? ( dev-cpp/nlohmann_json:= ) + 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:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= - dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) - ssl? ( dev-libs/openssl:= ) + rdma? ( sys-cluster/rdma-core:= ) + spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) - ${PYTHON_DEPS} " BDEPEND=" amd64? ( dev-lang/nasm ) @@ -111,13 +112,13 @@ BDEPEND=" dev-python/cython[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/sphinx - dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed + sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch @@ -127,6 +128,7 @@ BDEPEND=" sys-devel/flex ) test? ( + dev-util/cunit dev-python/coverage[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] dev-python/requests-mock[${PYTHON_USEDEP}] @@ -154,7 +156,6 @@ RDEPEND=" dev-python/pecan[${PYTHON_USEDEP}] dev-python/prettytable[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] mgr? ( @@ -176,22 +177,19 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} ${LUA_REQUIRED_USE} ?? ( jemalloc tcmalloc ) - jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) + rgw-lua? ( radosgw ) " -RESTRICT="!test? ( test )" - -# the tests need root access -RESTRICT="test? ( userpriv )" -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" +RESTRICT=" + !test? ( test ) +" -# create a non-debug release -CMAKE_BUILD_TYPE=RelWithDebInfo +# tests need root access, and network access +RESTRICT+="test" # false positives unless all USE flags are on CMAKE_WARN_UNUSED_CLI=no @@ -201,16 +199,21 @@ PATCHES=( "${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-16.2.2-no-virtualenvs.patch" + "${FILESDIR}/ceph-17.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-cython-0.29.patch" "${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch" - "${FILESDIR}/ceph-15.2.3-spdk-compile.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-16.2.2-system-zstd.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" ) check-reqs_export_vars() { @@ -245,7 +248,8 @@ src_prepare() { | xargs --null sed -r \ -e 's|Boost::|boost_|g' \ -e 's|Boost_|boost_|g' \ - -e 's|[Bb]oost_boost|boost_system|g' -i || die + -e 's|[Bb]oost_boost|boost_system|g' \ + -i || die fi if ! use systemd; then @@ -258,91 +262,102 @@ src_prepare() { 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 - - if ! use diskprediction; then - rm -rf src/pybind/mgr/diskprediction_local || die - fi + 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 -i "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" src/CMakeLists.txt + sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \ + -i src/CMakeLists.txt # 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_SPDK=$(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_RADOSGW_LUA_PACKAGES=$(usex rgw-lua "$(usex radosgw)" "NO") - -DWITH_RBD_RWL=$(usex rbd-rwl) - -DWITH_RBD_SSD_CACHE=$(usex rbd-ssd) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_LIBURING=$(usex uring) - -DWITH_SYSTEM_LIBURING=$(usex uring) - -DWITH_LIBCEPHSQLITE=$(usex sqlite) - -DWITH_XFS=$(usex xfs) - -DWITH_ZBD=$(usex zbd) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED="ON" - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_SYSTEM_ROCKSDB=ON - -DWITH_RDMA=OFF - -DWITH_TBB=OFF - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -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 - [[ ${EBUILD_PHASE} == configure ]] && mycmakeargs+=(-DWITH_JAEGER=$(usex jaeger)) + 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 + ) + 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 - for flag in ${CPU_FLAGS_X86[@]}; do + local flag + for flag in "${CPU_FLAGS_X86[@]}"; do case "${flag}" in avx*) local var=${flag%f} - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_NASM_X64_${var^^}=1")") + mycmakeargs+=( + "-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})" + ) ;; - *) mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")");; + *) 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) + 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 @@ -356,45 +371,27 @@ src_configure() { 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_build VERBOSE=1 all + cmake_build 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() { +python_compile() { local CMAKE_USE_DIR="${S}" - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - DESTDIR="${ED}" emake VERBOSE=1 install - popd >/dev/null || die + ceph_src_configure - python_optimize + cmake_build src/pybind/CMakeFiles/cython_modules } src_install() { - cmake_src_install python_foreach_impl python_install + python_setup + cmake_src_install + find "${ED}" -name '*.la' -type f -delete || die exeinto /usr/$(get_libdir)/ceph @@ -422,12 +419,8 @@ src_install() { # 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" - + 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 @@ -435,8 +428,6 @@ src_install() { readme.gentoo_create_doc - python_setup - # bug #630232 sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ || die "sed failed" @@ -452,7 +443,15 @@ src_install() { 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 } diff --git a/sys-cluster/ceph/files/ceph-16.2.2-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.2-no-virtualenvs.patch deleted file mode 100644 index fa865529d424..000000000000 --- a/sys-cluster/ceph/files/ceph-16.2.2-no-virtualenvs.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake -index d26d003c77..bc962e3aa7 100644 ---- a/cmake/modules/AddCephTest.cmake -+++ b/cmake/modules/AddCephTest.cmake -@@ -70,14 +70,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 94c0a56827..7f63e2adf4 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}" -@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM) - set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}") - endif() - 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 --verbose ${node_mirror_opt} -p --node=12.18.2 -- COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm -+ OUTPUT "/bin/npm" -+ COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "dashboard nodeenv is being installed" - ) diff --git a/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch b/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch new file mode 100644 index 000000000000..f80edddd8de7 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch @@ -0,0 +1,53 @@ +From 78edb6a91788133334ceeeda0c95529df5f40da8 Mon Sep 17 00:00:00 2001 +From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com> +Date: Mon, 14 Feb 2022 07:42:08 -0500 +Subject: [PATCH] rgw: cmake configure error on fedora-37/rawhide + +see +https://kojipkgs.fedoraproject.org//work/tasks/6624/82706624/build.log, +excerpted below + +... +CMake Error: The inter-target dependency graph contains the following +strongly connected component (cycle): "rgw_common" of type +STATIC_LIBRARY depends on "dbstore" (weak) depends on "sqlite_db" (weak) +"dbstore" of type SHARED_LIBRARY depends on "rgw_common" (weak) depends +on "sqlite_db" (weak) "sqlite_db" of type SHARED_LIBRARY depends on +"rgw_common" (weak) depends on "dbstore" (weak) At least one of these +targets is not a STATIC_LIBRARY. Cyclic dependencies are allowed only +among static libraries. CMake Generate step failed. Build files cannot +be regenerated correctly. +... + +https://tracker.ceph.com/issues/54266 + +Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> +--- + src/rgw/store/dbstore/CMakeLists.txt | 2 +- + src/rgw/store/dbstore/sqlite/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/store/dbstore/CMakeLists.txt +index 143ede3c094c9..18e032b73f54f 100644 +--- a/src/rgw/store/dbstore/CMakeLists.txt ++++ b/src/rgw/store/dbstore/CMakeLists.txt +@@ -47,7 +47,7 @@ else() + endif() + + include_directories(${CMAKE_INCLUDE_DIR}) +-add_library(dbstore ${dbstore_mgr_srcs}) ++add_library(dbstore STATIC ${dbstore_mgr_srcs}) + target_link_libraries(dbstore ${CMAKE_LINK_LIBRARIES}) + + # testing purpose +diff --git a/src/rgw/store/dbstore/sqlite/CMakeLists.txt b/src/rgw/store/dbstore/sqlite/CMakeLists.txt +index cce59b9ec0aa9..909765e3058b6 100644 +--- a/src/rgw/store/dbstore/sqlite/CMakeLists.txt ++++ b/src/rgw/store/dbstore/sqlite/CMakeLists.txt +@@ -12,5 +12,5 @@ include_directories(${CMAKE_INCLUDE_DIR}) + set(SQLITE_COMPILE_FLAGS "-DSQLITE_THREADSAFE=1") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SQLITE_COMPILE_FLAGS}") + +-add_library(sqlite_db ${sqlite_db_srcs}) ++add_library(sqlite_db STATIC ${sqlite_db_srcs}) + target_link_libraries(sqlite_db sqlite3 dbstore_lib rgw_common) diff --git a/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch b/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch new file mode 100644 index 000000000000..64b6d5c614c8 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch @@ -0,0 +1,69 @@ +diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc +index ad791ece4f7..2f78fd02bf9 100644 +--- a/src/common/ConfUtils.cc ++++ b/src/common/ConfUtils.cc +@@ -26,7 +26,7 @@ + #include <boost/algorithm/string.hpp> + #include <boost/algorithm/string/trim_all.hpp> + #include <boost/spirit/include/qi.hpp> +-#include <boost/spirit/include/phoenix.hpp> ++#include <boost/phoenix.hpp> + #include <boost/spirit/include/support_line_pos_iterator.hpp> + + #include "include/buffer.h" +diff --git a/src/mds/MDSAuthCaps.cc b/src/mds/MDSAuthCaps.cc +index b78ebd6615b..f8158be6866 100644 +--- a/src/mds/MDSAuthCaps.cc ++++ b/src/mds/MDSAuthCaps.cc +@@ -17,8 +17,8 @@ + #include <errno.h> + + #include <boost/spirit/include/qi.hpp> +-#include <boost/spirit/include/phoenix_operator.hpp> +-#include <boost/spirit/include/phoenix.hpp> ++#include <boost/phoenix/operator.hpp> ++#include <boost/phoenix.hpp> + + #include "common/debug.h" + #include "MDSAuthCaps.h" +diff --git a/src/mgr/MgrCap.cc b/src/mgr/MgrCap.cc +index cba758083c3..6e5e1f9bb99 100644 +--- a/src/mgr/MgrCap.cc ++++ b/src/mgr/MgrCap.cc +@@ -16,7 +16,7 @@ + #include <boost/spirit/include/qi_uint.hpp> + #include <boost/spirit/include/qi.hpp> + #include <boost/fusion/include/std_pair.hpp> +-#include <boost/spirit/include/phoenix.hpp> ++#include <boost/phoenix.hpp> + #include <boost/fusion/adapted/struct/adapt_struct.hpp> + #include <boost/fusion/include/adapt_struct.hpp> + #include <boost/algorithm/string/predicate.hpp> +diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc +index e1dc3723965..0ff9fefdd15 100644 +--- a/src/mon/MonCap.cc ++++ b/src/mon/MonCap.cc +@@ -16,7 +16,7 @@ + #include <boost/spirit/include/qi_uint.hpp> + #include <boost/spirit/include/qi.hpp> + #include <boost/fusion/include/std_pair.hpp> +-#include <boost/spirit/include/phoenix.hpp> ++#include <boost/phoenix.hpp> + #include <boost/fusion/adapted/struct/adapt_struct.hpp> + #include <boost/fusion/include/adapt_struct.hpp> + #include <boost/algorithm/string/predicate.hpp> +diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc +index e7bf0582799..f847e80e337 100644 +--- a/src/osd/OSDCap.cc ++++ b/src/osd/OSDCap.cc +@@ -14,8 +14,8 @@ + + #include <boost/config/warning_disable.hpp> + #include <boost/spirit/include/qi.hpp> +-#include <boost/spirit/include/phoenix_operator.hpp> +-#include <boost/spirit/include/phoenix.hpp> ++#include <boost/phoenix/operator.hpp> ++#include <boost/phoenix.hpp> + #include <boost/algorithm/string/predicate.hpp> + + #include "OSDCap.h" diff --git a/sys-cluster/ceph/files/ceph-17.2.0-findre2.patch b/sys-cluster/ceph/files/ceph-17.2.0-findre2.patch new file mode 100644 index 000000000000..e42f291e55bf --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-findre2.patch @@ -0,0 +1,22 @@ +diff --git a/src/arrow/cpp/cmake_modules/Findre2.cmake b/src/arrow/cpp/cmake_modules/Findre2.cmake +new file mode 100644 +index 00000000000..6f39de75461 +--- /dev/null ++++ b/src/arrow/cpp/cmake_modules/Findre2.cmake +@@ -0,0 +1,16 @@ ++FIND_PATH(SYSTEM_RE2_INCLUDE_DIR re2/re2.h) ++IF (SYSTEM_RE2_INCLUDE_DIR) ++ MESSAGE(STATUS "Found RE2 include dir") ++ FIND_LIBRARY(SYSTEM_RE2_LIBRARY re2) ++ IF (SYSTEM_RE2_LIBRARY) ++ MESSAGE(STATUS "Found RE2 library") ++ SET(RE2_INCLUDE_DIR ${SYSTEM_RE2_INCLUDE_DIR}) ++ SET(RE2_LIBRARY ${SYSTEM_RE2_LIBRARY}) ++ ELSE () ++ MESSAGE(FATAL_ERROR "Found RE2 headers, but not the library") ++ ENDIF () ++ELSE () ++ MESSAGE(STATUS "Did not find system RE2") ++ENDIF () ++ ++ diff --git a/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch b/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch new file mode 100644 index 000000000000..59b2be6ffd80 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e95019cedb2..814c7f4d0b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -178,7 +178,7 @@ endif() + + option(WITH_FUSE "Fuse is here" ON) + if(WITH_FUSE) +- find_package(FUSE) ++ find_package(FUSE 3.0) + set(HAVE_LIBFUSE ${FUSE_FOUND}) + endif() + diff --git a/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch b/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch new file mode 100644 index 000000000000..e50030071c81 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch @@ -0,0 +1,12 @@ +diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/store/dbstore/CMakeLists.txt +index 143ede3c094..204ef653010 100644 +--- a/src/rgw/store/dbstore/CMakeLists.txt ++++ b/src/rgw/store/dbstore/CMakeLists.txt +@@ -24,6 +24,7 @@ if(WITH_JAEGER) + list(APPEND link_targets ${jaeger_base}) + endif() + target_link_libraries(dbstore_lib PUBLIC ${link_targets}) ++install(TARGETS dbstore_lib DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} dbstore_lib) + diff --git a/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch new file mode 100644 index 000000000000..930dd08e8630 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-no-virtualenvs.patch @@ -0,0 +1,68 @@ +diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake +index 0df7125b508..01afc88289c 100644 +--- a/cmake/modules/AddCephTest.cmake ++++ b/cmake/modules/AddCephTest.cmake +@@ -57,7 +57,6 @@ endfunction() + + function(add_tox_test name) + set(test_name run-tox-${name}) +- set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv) + cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN}) + if(DEFINED TOXTEST_TOX_PATH) + set(tox_path ${TOXTEST_TOX_PATH}) +@@ -71,27 +70,13 @@ function(add_tox_test name) + endif() + string(REPLACE ";" "," tox_envs "${tox_envs}") + find_package(Python3 QUIET REQUIRED) +- add_test( +- NAME setup-venv-for-${name} +- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${venv_path} +- WORKING_DIRECTORY ${tox_path}) +- set_tests_properties(setup-venv-for-${name} PROPERTIES +- FIXTURES_SETUP venv-for-${name}) +- add_test( +- NAME teardown-venv-for-${name} +- COMMAND ${CMAKE_COMMAND} -E remove_directory ${venv_path}) +- set_tests_properties(teardown-venv-for-${name} PROPERTIES +- FIXTURES_CLEANUP venv-for-${name}) + add_test( + NAME ${test_name} + COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh + --source-dir ${CMAKE_SOURCE_DIR} + --build-dir ${CMAKE_BINARY_DIR} + --tox-path ${tox_path} +- --tox-envs ${tox_envs} +- --venv-path ${venv_path}) +- set_tests_properties(${test_name} PROPERTIES +- FIXTURES_REQUIRED venv-for-${name}) ++ --tox-envs ${tox_envs}) + set_property( + TEST ${test_name} + PROPERTY ENVIRONMENT +diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt +index 9166553dc73..9a6c87595b9 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=${Python3_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/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 diff --git a/sys-cluster/ceph/files/ceph-17.2.0-pybind-boost-1.74.patch b/sys-cluster/ceph/files/ceph-17.2.0-pybind-boost-1.74.patch new file mode 100644 index 000000000000..8591b0bc7f89 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-pybind-boost-1.74.patch @@ -0,0 +1,26 @@ +diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt +index cd9b27623d2..12688ad32b9 100644 +--- a/src/pybind/CMakeLists.txt ++++ b/src/pybind/CMakeLists.txt +@@ -36,6 +36,10 @@ execute_process( + OUTPUT_VARIABLE "PYTHON3_INSTDIR" + OUTPUT_STRIP_TRAILING_WHITESPACE) + ++if(Boost_VERSION VERSION_GREATER_EQUAL 1.74) ++ add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) ++endif() ++ + install(FILES + ceph_argparse.py + ceph_daemon.py +diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt +index fc033766cc4..0ba3bc56e98 100644 +--- a/src/test/librados/CMakeLists.txt ++++ b/src/test/librados/CMakeLists.txt +@@ -1,3 +1,6 @@ ++ ++add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) ++ + # radostest + add_library(radostest_shared OBJECT test_shared.cc) + target_include_directories(radostest_shared PRIVATE diff --git a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch new file mode 100644 index 000000000000..6e0788a093e5 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch @@ -0,0 +1,20 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 30cf3605468..902e2123d04 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -430,9 +430,12 @@ add_dependencies(common-objs legacy-option-headers) + + if(WITH_JAEGER) + find_package(thrift 0.13.0 REQUIRED) +- include(BuildOpentelemetry) +- build_opentelemetry() +- set(jaeger_base opentelemetry::libopentelemetry thrift::libthrift) ++ find_package(opentelemetry-cpp 1.3.0 REQUIRED) ++ set(jaeger_base ++ opentelemetry-cpp::common ++ opentelemetry-cpp::trace ++ opentelemetry-cpp::jaeger_trace_exporter ++ thrift::libthrift) + add_dependencies(common-objs ${jaeger_base}) + target_link_libraries(common-objs ${jaeger_base}) + endif() diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml index 7d50f4e2cdc3..0f7b1135bd12 100644 --- a/sys-cluster/ceph/metadata.xml +++ b/sys-cluster/ceph/metadata.xml @@ -5,10 +5,6 @@ <email>chutzpah@gentoo.org</email> <name>Patrick McLean</name> </maintainer> - <maintainer type="person"> - <email>dlan@gentoo.org</email> - <name>Yixun Lan</name> - </maintainer> <maintainer type="project"> <email>cluster@gentoo.org</email> <name>Gentoo Cluster Project</name> @@ -29,11 +25,13 @@ <flag name="lttng">Add support for LTTng</flag> <flag name="mgr">Build the ceph-mgr daemon</flag> <flag name="numa">Use <pkg>sys-process/numactl</pkg> for numa support in rocksdb</flag> + <flag name="parquet">Support for s3 select on parquet objects</flag> <flag name="pmdk">Enable PMDK libraries</flag> <flag name="rabbitmq">Use rabbitmq-c to build rgw amqp push endpoint</flag> <flag name="radosgw">Add radosgw support</flag> <flag name="rbd-rwl">Enable librbd persistent write back cache</flag> <flag name="rbd-ssd">Enable librbd persistent write back cache for SSDs</flag> + <flag name="rdma">Enable RDMA support via <pkg>sys-cluster/rdma-core</pkg></flag> <flag name="rgw-lua">Rados Gateway's support for dynamically adding lua packagess</flag> <flag name="system-boost">Use system <pkg>dev-libs/boost</pkg> instead of the bundled one</flag> <flag name="uring">Build with support for <pkg>sys-libs/liburing</pkg></flag> @@ -41,4 +39,7 @@ <flag name="xfs">Add xfs support</flag> <flag name="zfs">Add zfs support</flag> </use> + <upstream> + <bugs-to>https://tracker.ceph.com/issues</bugs-to> + </upstream> </pkgmetadata> |