diff options
Diffstat (limited to 'sys-cluster')
44 files changed, 1029 insertions, 984 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex 381e03a97ad9..3e0e615749db 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz 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> diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index 33408b017621..48e497dd717e 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -1,6 +1,6 @@ DIST charliecloud-0.26.tar.gz 472324 BLAKE2B 2b4b8f44f05a497e9367e97e49de255170b610880ef5d7909f7837bc54962f2c2de929d8381b99dc3f4b6124583744993b59839f8f1481cdbd5dc32334d3da9f SHA512 a8638db42a5563723b62ba0e9b9861b41e76b9246b94887d57a8d4c421d9dd2e8c0965b62af166e47859b72a50a2e01ec6775ef13f79c52696a6b2fd95134174 DIST charliecloud-0.27.tar.gz 471754 BLAKE2B b683847a79dd55a4bb79458e94e03988acdff0a1e6a24e7f67d56758bdbc3754cc3609e97bfc778f5cb6ce35d6f4df773235314c2ed642ac796b28b824ecadf6 SHA512 cfa5b1ac923008b9a38fc0228562b31551ea941bf222c9b9e12d8dce4c83ca896893e3509773a5ebc02d6b374d08dc049797226cf1432099aae7174c2bc5ee2b -EBUILD charliecloud-0.26-r1.ebuild 2226 BLAKE2B 8ec73950df4519a606096cc14c5092c6547c26874ae28da1e98efb53498ab0725804321b1fc5960891b6ad78c1ecefdd0eac7f52dd9d233c982f7189915227f1 SHA512 76699826a6a5a10420b651317c4b074fd883d1d1ac5562431cdc74cb7997991434c50bc05960b7df51b21d05b09b9257e30e9f336e502c341f531f0ed83838da -EBUILD charliecloud-0.27.ebuild 2230 BLAKE2B c9b1f02893c06d65118d21f14fbd2fca75cad01c69e15db450239015e38b22572491d2180f299bdce265177f158a62a171605172ecc6a7cf9765eb9e225be8fd SHA512 53811b9e665a81d26d0382e33a09a94a4f027653b7c2003f58607957857d53351fb2d7b37a4f943d92f6d83832db32b72be0bbdd82b7fb3cbea064312e790137 -EBUILD charliecloud-9999.ebuild 2230 BLAKE2B c9b1f02893c06d65118d21f14fbd2fca75cad01c69e15db450239015e38b22572491d2180f299bdce265177f158a62a171605172ecc6a7cf9765eb9e225be8fd SHA512 53811b9e665a81d26d0382e33a09a94a4f027653b7c2003f58607957857d53351fb2d7b37a4f943d92f6d83832db32b72be0bbdd82b7fb3cbea064312e790137 +EBUILD charliecloud-0.26-r1.ebuild 2212 BLAKE2B ded4636af00e900c20a9fdc490065dc448d8d85263704bc4e28229fbf54614e47bc9ca506071bbb202fef133050256f7854b7e3cfd13aa166e7475aae0ccdd62 SHA512 3d061dd9b559d8f69a95c240ec98ae2866b38229cf2f5eb5c50c1b3c9f0078a6833a9374ba079d12802757dff5fb0a99829b8839330dba2235387a9437c0e7c2 +EBUILD charliecloud-0.27.ebuild 2216 BLAKE2B 9e9abb242ce5689572a9f2e5c5b755195613dc9dc65c6c437f851803bac4b330ef43d5228c93e0f5f109a128c1dad073363375d1b54787374f3db73777eaacf6 SHA512 579c3e9e6c518b2d731dc8bfa12a6b41de11c57e4f2f369a088023a3ad2427e7ca4faeb6307ca07465ff98cb0ce57a1e58580917dcfc083a7369d4e83700ef21 +EBUILD charliecloud-9999.ebuild 2216 BLAKE2B 9e9abb242ce5689572a9f2e5c5b755195613dc9dc65c6c437f851803bac4b330ef43d5228c93e0f5f109a128c1dad073363375d1b54787374f3db73777eaacf6 SHA512 579c3e9e6c518b2d731dc8bfa12a6b41de11c57e4f2f369a088023a3ad2427e7ca4faeb6307ca07465ff98cb0ce57a1e58580917dcfc083a7369d4e83700ef21 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678 diff --git a/sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild index 14f8aa4a1aa5..229be33862e8 100644 --- a/sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild @@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS} DEPEND=" ch-image? ( $(python_gen_cond_dep ' - dev-python/lark-parser[${PYTHON_USEDEP}] + dev-python/lark[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') ) @@ -64,7 +64,7 @@ src_configure() { --with-sphinx-python=${PYTHON} # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 --enable-buggy-build - # Do not use bundled version of dev-python/lark-parser. + # Do not use bundled version of dev-python/lark. --disable-bundled-lark # Use correct shebang. --with-python=${PYTHON} diff --git a/sys-cluster/charliecloud/charliecloud-0.27.ebuild b/sys-cluster/charliecloud/charliecloud-0.27.ebuild index e3f49d23c4f0..41b9c8ba478d 100644 --- a/sys-cluster/charliecloud/charliecloud-0.27.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.27.ebuild @@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS} DEPEND=" ch-image? ( $(python_gen_cond_dep ' - dev-python/lark-parser[${PYTHON_USEDEP}] + dev-python/lark[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') ) @@ -64,7 +64,7 @@ src_configure() { --with-sphinx-python="${PYTHON}" # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 --enable-buggy-build - # Do not use bundled version of dev-python/lark-parser. + # Do not use bundled version of dev-python/lark. --disable-bundled-lark # Use correct shebang. --with-python="${PYTHON}" diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index e3f49d23c4f0..41b9c8ba478d 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS} DEPEND=" ch-image? ( $(python_gen_cond_dep ' - dev-python/lark-parser[${PYTHON_USEDEP}] + dev-python/lark[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') ) @@ -64,7 +64,7 @@ src_configure() { --with-sphinx-python="${PYTHON}" # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 --enable-buggy-build - # Do not use bundled version of dev-python/lark-parser. + # Do not use bundled version of dev-python/lark. --disable-bundled-lark # Use correct shebang. --with-python="${PYTHON}" diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest index a2b36f13b5e6..a6cff80e1021 100644 --- a/sys-cluster/k3s/Manifest +++ b/sys-cluster/k3s/Manifest @@ -4,12 +4,16 @@ AUX k3s.logrotated 37 BLAKE2B 8e106b2ae826d1724adb3cf6970cb46b53247ce77a8206ce9f AUX k3s.service 597 BLAKE2B 067ea095d2ad948a59e6fcc6ecc569d3f8fa4e802e381e5ccc48988c70c5e8e9e4335afc7cf5a2e830d22bd89cabffbc6fb9161da73599be75b305eb28bea14a SHA512 9741575f844da8ed96e230c443ec6662bff22be8602b420eb74fc6a72d09f36a5fddb8426894e63b7a8c2918a36fc717a38dfbcf003b56f47c13c06c4fc96825 DIST k3s-1.23.4_p1-vendor.tar.gz 29494135 BLAKE2B 8e8598f43255b105e14b59ec54e7d3b19c4d8c10f61287a7e138153030b728cf41c7b9ad3d8300f7209a96421b7f934ed3a3ca63baac48babb376af664248536 SHA512 b2f98be943c6c4eedabc29e8703653fd78abf880eff306076d2e64a4756829adc848b1e48a735662a9264de94b2c86abff029c7a284c37c322bfa7537e35064b DIST k3s-1.23.5_p1-vendor.tar.gz 30890421 BLAKE2B eb9b26e40ad07e7ff250c0add216507bf536a561b2295f35f22855d3d93d7034d002526585563428762f801ec44dc32229a65afb2c9e68cb953174b29c98ea29 SHA512 837fd725a5ba9d7714935e83d10187b416f1cd6e7a97728833a3d44c6b5ce1bb2d56a80551474ec0e0b78230e2ff085ec1b643e8c9522d85d5c99f0d750ed6d1 +DIST k3s-1.23.6_p1-vendor.tar.gz 31455285 BLAKE2B c924b3cbbc512757d05127dc284e9d843e6f53bb732f7be51e885e7e130a0b8a9aa1a8b6141e4947c063d7276480321a5d7752a28aa825f35ae73c6bab33e144 SHA512 74dcd8b86ed54dd7bb84c5544846d35ed3ea9c6241c268c7c37c4f9e09e6d0d255b3f6661c3e2af493b50cfae7b7c5fb4623d92b241de9c552b3a97f4ee50090 DIST k3s-cni-plugins-1.0.1.tar.gz 5711129 BLAKE2B d75557a10de1dccd79b1953c167b0054c229a9cade891b87ece0133be4660fde5c442f253cec8938db87886fc6c39d5a68214262c9ec5c3266a1321ebb75bee7 SHA512 dff27fa602e948ab51745151614713262bc25dfe687a0f3e8b7bab4aa63d40e5e5cfa652e34455fea3f1f38558c3f648aa6021f134d78b4b49e7764f8e894d07 DIST k3s-containerd-1.5.10-k3s1.tar.gz 9903838 BLAKE2B b188b29d2e0bea30431b9b2ddc3aa1b3e432f283f3af4b125497ba4d7df7559ecf50e197508fb068c04491adeb6831f3758755d497206572527c2ea3cc2c3cfe SHA512 950b72955cd3aff78a232c217517bc945601a289ab636ca79c6bdaf2768f26e86f46fab7020396b21dbae37acfeec499db801f651eccb581789ca90a991987ab +DIST k3s-containerd-1.5.11-k3s2.tar.gz 9669969 BLAKE2B 11ec3ead4c17773978e21d1ac19a321c3e3e453f12bd79ec67bdfdfa061dac8d09278dabc9bfd0fc8795b70325683b236b43cdc5ebcd9873a40baac124b1b748 SHA512 dfe3a8e6c31684c378c156f4ce3f98c0307df3464d3b3d2cca4a04be8f158d01b279362af5eb447cf24aad7f7ff28d87e92dd64430e480afcee9a9cef0eb2b8a DIST k3s-containerd-1.5.9-k3s1.tar.gz 9800317 BLAKE2B 95129dbf41ff9c88dc44e6aea791b0f8010116d57142bc0a7079fa6bd9f4ac1f83ce35d1a7baa2848bf6d4640362f95ec5ee8198dc3d2feee3e0648313fc2eeb SHA512 f312246f98b27b92ffea962678b9175da2b18ed26cd70d8b7bc90f39ade0a8c21591953662a57a5358527654b4046c95ea9af52fea03edd6becd90ec3a9b6abe DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3 DIST k3s-runc-v1.0.3-r1.tar.gz 2375241 BLAKE2B 0fb9368ab5442462001c15a67a71821133ad90d16cac5aac760e52b2477db69c0a5dd59df42601119b19ede508889796c994a24624f88ec6a1a29dad19e0bf33 SHA512 64a1894c2b4ed5a68b185e88548fc9fbbd01d8a9495feed59fb196aa06763d64cfb71ca6cbc09d1defa26a0d94ad58626296585741f23df2e290147ba6c4c26e DIST traefik-10.14.1.tgz 24840 BLAKE2B 163d5b0f03677efc068e6478f2c3efca4eac793e8e0185ee6bce6fa76b5c9729c95a0c64f54352066aebb08883ee6e8cc5c2392ab882b64a31809cc203275d72 SHA512 04fa9630d13a413c34c4856a67a884c9bb06be8813cb36ec380183d23b352404204d098ef4a03a1e94c4a2a6c6b99cd5023b0914b42d8daf6cde322815e35ce1 +DIST traefik-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9 EBUILD k3s-1.23.4_p1.ebuild 4071 BLAKE2B 4249e3095b389cbe74d72c218a7e3e0d1a5490f93afb5ecc876f49814dc98eb6534f39b38f3e22ea44dbbb9a8e957562d15b6e5a077c6b43f38f5fd21bda5670 SHA512 ee44dc53b4e55d873d93dd566229887432a32b0d056128d5b2bca6bdc57f9b8786610236664e80841574d137a60ceb0cbdf24687fd0b5b6dae1877c1f34afbdc EBUILD k3s-1.23.5_p1.ebuild 4072 BLAKE2B cdf23cfebee217bda383e0fd57403a831bc3abacbf040a0e4fef7d61a9f99c16c0ce7a5bfcbc125cff3834f7aa8b15adf2dc2d8fe2e81dc5c716e10583ae00d3 SHA512 99826ce124a0f8abe8fd8a182d3eef5d325f902db2e9b5897db8688a0e9e795fb4689e9670a9088cab0363c2607cacf2b204f7d7946ba3f7023155f56a5e2ea3 +EBUILD k3s-1.23.6_p1.ebuild 4072 BLAKE2B fbf06dbcb0ee7dbf8bdb41d7eb4cdfdb5d9b8e8fd4d1b48b5f92609b7935c9e5002cc6f2e173e85d6ca35bf8319418d4a422e159c4c77ff71461073300b8fb22 SHA512 fc786765567c37b29bded0d55357addc0647ac611d55d44df5df4f0497965bdac5bb928c910dd995663dabe6d07f194bc31d6e324132a00931712c1a2cfebef2 MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46 diff --git a/sys-cluster/k3s/k3s-1.23.6_p1.ebuild b/sys-cluster/k3s/k3s-1.23.6_p1.ebuild new file mode 100644 index 000000000000..f4cbad57825e --- /dev/null +++ b/sys-cluster/k3s/k3s-1.23.6_p1.ebuild @@ -0,0 +1,102 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module linux-info systemd + +DESCRIPTION="Lightweight Kubernetes" +HOMEPAGE="https://k3s.io" +K3S_CONTAINERD_VERSION=1.5.11-k3s2 +K3S_RUNC_VERSION=v1.0.3 +K3S_ROOT_VERSION=0.11.0 +K3S_TRAEFIK_VERSION=10.19.3 +K3S_TRAEFIK_PACKAGE_VERSION=00 +K3S_CNIPLUGINS_VERSION=1.0.1 +CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN" + +MY_PV=${PV%_p*}+k3s${PV#*_p} +SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz + ${EGO_SUM_SRC_URI} + https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz + https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz + https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz + https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz + amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+kubectl-symlink rootless" +REQUIRED_USE="|| ( amd64 )" +DEPEND=" + app-misc/yq + net-firewall/conntrack-tools + sys-fs/btrfs-progs + rootless? ( app-containers/slirp4netns ) +" +RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )" +RESTRICT+=" test" + +S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor + +src_unpack() { + unpack ${P}-vendor.tar.gz + cd "${S}" || die + mkdir -p bin/aux build/static/charts cache etc || die + cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die + cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die +} + +src_prepare() { + local filename pattern replacement + default + + local CONTAINERD_DIR=build/src/github.com/containerd/containerd + mkdir -p "${CONTAINERD_DIR}" || die + tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die + if has_version -b ">=dev-lang/go-1.18"; then + # https://bugs.gentoo.org/835601 + sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die + fi + + local RUNC_DIR=build/src/github.com/opencontainers/runc + mkdir -p "${RUNC_DIR}" || die + tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz" -C "${RUNC_DIR}" || die + + # Disable download for files fetched via SRC_URI. + sed -e 's:^[[:space:]]*curl:#\0:' \ + -e 's:^[[:space:]]*git:#\0:' \ + -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \ + -e 's:^rm -rf \${RUNC_DIR}:#\0:' \ + -e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \ + -e 's:yq e :yq -r :' \ + -e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \ + -i scripts/download || die + sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die + pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR' + filename=scripts/build + grep -qF "${pattern}" "${filename}" || \ + die "failed to locate plugins clone command" + sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \ + -e 's|rm -rf $TMPDIR||' \ + -i "${filename}" || die + sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die +} + +src_compile() { + mkdir -p build/data || die + "${BASH}" -ex ./scripts/download || die + ./scripts/build || die + ./scripts/package-cli || die +} + +src_install() { + dobin "dist/artifacts/${PN}" + use kubectl-symlink && dosym k3s /usr/bin/kubectl + systemd_dounit "${FILESDIR}/${PN}.service" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + dodoc README.md +} diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest index de669c87d114..31619d0c18c7 100644 --- a/sys-cluster/keepalived/Manifest +++ b/sys-cluster/keepalived/Manifest @@ -4,5 +4,7 @@ AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f AUX keepalived.service-r1 349 BLAKE2B 8ad78799046d586a5f98ebd53b9f449918bea5947a818b88d92135f7269ec583e6c52c90f2e8ed365b8c96b66d019753a7f139b63d0cfd361d924372672a3d50 SHA512 4850d785ff6761c75a7f1a5cbf2d8ad0f96ab46287992123a3a8ae4085d7102fd8bbbbb6104ad35747beb8f04c9e0e3a0aceb95a900bb03f3b5575a9d8814d2e AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a DIST keepalived-2.2.4.tar.gz 1151290 BLAKE2B 835198fb23312e87894e7740427411d974c00f71029b273d8da3e787ef92848127d896b456fb40db8d802b6c7555e6524872f136f868e19c62387a9471e44b0f SHA512 b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422 +DIST keepalived-2.2.7.tar.gz 1180180 BLAKE2B 62c4534eb1eebeac596b628a1fa5fb4069498d532fdeff0dc51afbc71e90125bff7fcffb897da3fd34765c64f43d7b04dcf184169b1bc2cf33413e109f9f5cdc SHA512 9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968 EBUILD keepalived-2.2.4.ebuild 1921 BLAKE2B 5a0dac53343fd1ca1ab4ba59e003c37d92e86cecbbfe45e35e3291e52d7a7f0b33674c4e3c4a399a871f81257adeabd864372c1d202d50125637a746c466c191 SHA512 3e1b8e28c8741d384e46031d73557a43e2ace3ca0b9f6798576c47ad9e63773179f8babfb4dc1118d1769dda7ed46a4c57f328a63b23d50dbb5ccd3ec5e81c39 +EBUILD keepalived-2.2.7.ebuild 1924 BLAKE2B be7f88c0d938b0270335f126e7fa6b33965971545b2a8f979507bca733329e78d6a7b1b81dbc722177ef9bd00b1a6f4f1ee72be4ecc47aa78e13d63c73dc0a6d SHA512 f555c3db830b048ea54ad0dd596c2dc1fb0a1c313a5e7ef1438ec12e29b24097abcb11214332ecf0bf7305cc7634d785874b63a18ad8aa2804c00f0108853b73 MISC metadata.xml 613 BLAKE2B e9c0ffc59326021d01ca9003ed5e249d1d11672bcc27de65be9889bd8d20ed5818f15d327d9bfd53d9406da2a67a1be9df40da60f6584f969c4c3ce62b35a065 SHA512 b5681eda044f3a4c6fe91894c27d474e6a1109a4594d0955aac024906a687ef83613ac29b58cad04d70ffa9efc1305ccb9620bbea9acc89159e97b667e7c073f diff --git a/sys-cluster/keepalived/keepalived-2.2.7.ebuild b/sys-cluster/keepalived/keepalived-2.2.7.ebuild new file mode 100644 index 000000000000..37a8d7f17e5b --- /dev/null +++ b/sys-cluster/keepalived/keepalived-2.2.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project" +HOMEPAGE="https://www.keepalived.org/" +SRC_URI="https://www.keepalived.org/software/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="+bfd dbus json regex snmp systemd" + +RDEPEND=" + dev-libs/libnl:= + dev-libs/openssl:= + dev-libs/popt + net-libs/libnfnetlink + sys-apps/iproute2 + regex? ( >=dev-libs/libpcre2-8:= ) + dbus? ( + sys-apps/dbus + dev-libs/glib:2 + ) + json? ( dev-libs/json-c:= ) + snmp? ( net-analyzer/net-snmp:= ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-4.4" + +DOCS=( + README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO + doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # keepalived has support to dynamically use some libraries instead of + # linking them: + #--enable-dynamic-linking \ + #--enable-libiptc-dynamic \ + #--enable-libnl-dynamic \ + #--enable-libxtables-dynamic \ + econf \ + --with-init="$(usex systemd systemd custom)" \ + --with-kernel-dir="${ESYSROOT}"/usr \ + --enable-vrrp \ + $(use_enable bfd) \ + $(use_enable dbus) \ + $(use_enable json) \ + $(use_enable regex) \ + $(use_enable snmp) \ + $(use_enable snmp snmp-rfc) \ + $(use_enable systemd) +} + +src_install() { + default + + newinitd "${FILESDIR}"/keepalived.init-r1 keepalived + newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived + + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service + systemd_install_serviced "${FILESDIR}/${PN}.service.conf" + + use snmp && dodoc doc/*MIB.txt + + # This was badly named by upstream, it's more HOWTO than anything else. + newdoc INSTALL INSTALL+HOWTO + + # Clean up sysvinit files + rm -rv "${ED}"/etc/sysconfig || die +} diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest index 5e0ee3ad345b..4ae600fec793 100644 --- a/sys-cluster/kube-apiserver/Manifest +++ b/sys-cluster/kube-apiserver/Manifest @@ -4,7 +4,9 @@ AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2 +DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0 EBUILD kube-apiserver-1.21.11.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1 EBUILD kube-apiserver-1.22.8.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1 EBUILD kube-apiserver-1.23.5.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815 +EBUILD kube-apiserver-1.24.0.ebuild 992 BLAKE2B 78848d01aea6d0efb3c42f0af1ef60b6b80e8884fa1c0b3d811ade0dfe3d0552f2adda802eea4478b069323807a96ff915c329a1bd37d60b3d7d87cf63a6ac7a SHA512 13ef47a1f969ac0437f103e04825cbdf5a8951bed255b69199d8270a1f4b42324c2c9c84fdac7466d64f42682ef81fa90256921a58dcfecb5b03257e845498c7 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild new file mode 100644 index 000000000000..a7400f70bdbe --- /dev/null +++ b/sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit bash-completion-r1 go-module systemd + +DESCRIPTION="Kubernetes API server" +HOMEPAGE="https://kubernetes.io" +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="hardened" + +COMMON_DEPEND=" + acct-group/kube-apiserver + acct-user/kube-apiserver" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND=">=dev-lang/go-1.17" + +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} +} + +src_install() { + dobin _output/bin/${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotated ${PN} + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} +} diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest index 7ae27f1ebccb..a3d8299ccdf3 100644 --- a/sys-cluster/kube-controller-manager/Manifest +++ b/sys-cluster/kube-controller-manager/Manifest @@ -4,7 +4,9 @@ AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcd DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2 +DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0 EBUILD kube-controller-manager-1.21.11.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee EBUILD kube-controller-manager-1.22.8.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee EBUILD kube-controller-manager-1.23.5.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477 +EBUILD kube-controller-manager-1.24.0.ebuild 989 BLAKE2B 6502e890aa70159eed88ed4d79d0ae176355ce33fea5e47fa87986769586abc5fc9d1a220b1b79116e25bc8f66bf1ae0765f18b731159c94ea7692913591127a SHA512 207f261358a494ce4d6a7b8d1805157fab087b6eadbd04122fbd40482112276e22e180314740e520707c176d5c2c1aaa57e8752a447ef5b35115d2da28941d17 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild new file mode 100644 index 000000000000..8a6411803c93 --- /dev/null +++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module + +DESCRIPTION="Kubernetes Controller Manager" +HOMEPAGE="https://kubernetes.io" +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="hardened" + +COMMON_DEPEND="acct-group/kube-controller-manager + acct-user/kube-controller-manager" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND=">=dev-lang/go-1.17" + +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} +} + +src_install() { + dobin _output/bin/${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotated ${PN} + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} +} diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest index 9dc6d497a3b5..1c3cb4072b9b 100644 --- a/sys-cluster/kube-proxy/Manifest +++ b/sys-cluster/kube-proxy/Manifest @@ -4,7 +4,9 @@ AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2 +DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0 EBUILD kube-proxy-1.21.11.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13 EBUILD kube-proxy-1.22.8.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13 EBUILD kube-proxy-1.23.5.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a +EBUILD kube-proxy-1.24.0.ebuild 904 BLAKE2B 3630914e093e3f07eaaaa9e7d9a2bb7706810d3fc9b13843d9caf7dae3baa29fe25b2d1b0fa97545cf074cc56bf59bcfdc2595926fd1785cb93efaa2f4743234 SHA512 1a1a893b9f33407cceecd7e5e06fc9f1baf6e76a2831029b3d7d6743b1090b6c73ab96061e74d54f0f4fd5771b65f6891c58f67ff737ffd52f349edb5ef5f155 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild new file mode 100644 index 000000000000..2193eb857e81 --- /dev/null +++ b/sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module + +DESCRIPTION="Kubernetes Proxy service" +HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io" +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="hardened" + +RDEPEND="net-firewall/conntrack-tools" +BDEPEND=">=dev-lang/go-1.17" + +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} +} + +src_install() { + dobin _output/bin/${PN} + keepdir /var/log/${PN} /var/lib/${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotated ${PN} +} diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest index a9df28c47a07..95b7f1322b41 100644 --- a/sys-cluster/kube-scheduler/Manifest +++ b/sys-cluster/kube-scheduler/Manifest @@ -4,7 +4,9 @@ AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2 +DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0 EBUILD kube-scheduler-1.21.11.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca EBUILD kube-scheduler-1.22.8.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca EBUILD kube-scheduler-1.23.5.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120 +EBUILD kube-scheduler-1.24.0.ebuild 962 BLAKE2B ebc2aeda907841925e5c217a07407dddac04b82f46271387b1403486b870d95d42d40c4107da9741a7325efa812efecf4cbe771697071ad3e6639f5136631d9a SHA512 0b9cef2e337d0c0af9bd3b2f2e4131d434423724f27fed7992df106bde8e7c788cc5a207b0ef97c7e6ae9d5c50e0fe54c06876a1b24d89e184beb90feca17fbe MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild new file mode 100644 index 000000000000..393cef8175ab --- /dev/null +++ b/sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module + +DESCRIPTION="Kubernetes Scheduler" +HOMEPAGE="https://kubernetes.io" +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="hardened" + +COMMON_DEPEND="acct-group/kube-scheduler + acct-user/kube-scheduler" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND=">=dev-lang/go-1.17" + +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} +} + +src_install() { + dobin _output/bin/${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotated ${PN} + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} +} diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest index 2a6c34184d5b..dd85cbc80a7d 100644 --- a/sys-cluster/kubeadm/Manifest +++ b/sys-cluster/kubeadm/Manifest @@ -1,7 +1,9 @@ DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2 +DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0 EBUILD kubeadm-1.21.11.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda EBUILD kubeadm-1.22.8.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda EBUILD kubeadm-1.23.5.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a +EBUILD kubeadm-1.24.0.ebuild 878 BLAKE2B 2278f6ff3cd15b03d5fafd5d5e03e6a565666171533c849750fbabee73e9300e29a4b3b80d213e0ca05ed43854f3b3444579d4da6081c40f09aa7633cb3d97f7 SHA512 b9c84df0bac044457c6cc1db5e745955349b2e035ae49ec91ea7f2f478eb2d40e0d904238ca0f2a4307eea0c2e59410c26935b7f52c72a5f45a819983493e0ad MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3 diff --git a/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild new file mode 100644 index 000000000000..bcdb2bea7e7d --- /dev/null +++ b/sys-cluster/kubeadm/kubeadm-1.24.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit bash-completion-r1 go-module + +DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster" +HOMEPAGE="https://kubernetes.io" +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="hardened" + +BDEPEND=">=dev-lang/go-1.17" + +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} +} + +src_install() { + dobin _output/bin/${PN} + _output/bin/${PN} completion bash > ${PN}.bash || die + _output/bin/${PN} completion zsh > ${PN}.zsh || die + newbashcomp ${PN}.bash ${PN} + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} +} diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest index 9c055f1aeb77..bc04fd3a4b61 100644 --- a/sys-cluster/kubectl/Manifest +++ b/sys-cluster/kubectl/Manifest @@ -1,7 +1,9 @@ DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2 +DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0 EBUILD kubectl-1.21.11.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516 EBUILD kubectl-1.22.8.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516 EBUILD kubectl-1.23.5.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7 +EBUILD kubectl-1.24.0.ebuild 874 BLAKE2B f8edcff235a13dab9ff396b87d207ef4d829ac54213b312621f4f3d9da9e76828af7bbf2ba312ebc8255764568591775501478cdba4533cb6c3f3bbcd6ef47bd SHA512 21c7c81aa7ec98429c6cf6d993ee7ed90380e0f8a32799c66dc80e40d9a3a7b4d7a3612edb1673ce99f1fea6e9f04e0b9bbcffccb73f78f72f261127556cac9e MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kubectl/kubectl-1.24.0.ebuild b/sys-cluster/kubectl/kubectl-1.24.0.ebuild new file mode 100644 index 000000000000..93befd485395 --- /dev/null +++ b/sys-cluster/kubectl/kubectl-1.24.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit bash-completion-r1 go-module + +DESCRIPTION="CLI to run commands against Kubernetes clusters" +HOMEPAGE="https://kubernetes.io" +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="hardened" + +BDEPEND=">=dev-lang/go-1.17" + +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} +} + +src_install() { + dobin _output/bin/${PN} + _output/bin/${PN} completion bash > ${PN}.bash || die + _output/bin/${PN} completion zsh > ${PN}.zsh || die + newbashcomp ${PN}.bash ${PN} + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} +} diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest index 95e91af8b6c5..7546d9b48668 100644 --- a/sys-cluster/kubelet/Manifest +++ b/sys-cluster/kubelet/Manifest @@ -6,7 +6,9 @@ AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c1 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2 +DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0 EBUILD kubelet-1.21.11.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0 EBUILD kubelet-1.22.8.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0 EBUILD kubelet-1.23.5.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6 +EBUILD kubelet-1.24.0.ebuild 970 BLAKE2B fc431b0d0543d2a6d8a0a38aea43443a218437dea52c2e5719e9b21266a648137a27acaf4dacc4ca3ff1e575e62f13b80a0d67c17e80a12135e0685c99ada902 SHA512 b868d712bfa9a549eac6b3836c6d6c6f8fee039fd74b735bb37dbd0dc2d49987ac40b927f93b08425a9b67b710a4bc38a062a1472e5334cd4ad7cc63294d51ac MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kubelet/kubelet-1.24.0.ebuild b/sys-cluster/kubelet/kubelet-1.24.0.ebuild new file mode 100644 index 000000000000..ecbeff2f53f1 --- /dev/null +++ b/sys-cluster/kubelet/kubelet-1.24.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd + +DESCRIPTION="Kubernetes Node Agent" +HOMEPAGE="https://kubernetes.io" +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="hardened" + +BDEPEND=">=dev-lang/go-1.17" + +RESTRICT+=" test " +S="${WORKDIR}/kubernetes-${PV}" + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} +} + +src_install() { + dobin _output/bin/${PN} + keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotated ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service + insinto /etc/kubernetes + newins "${FILESDIR}"/${PN}.env ${PN}.env +} diff --git a/sys-cluster/lustre/Manifest b/sys-cluster/lustre/Manifest deleted file mode 100644 index 87567375f7db..000000000000 --- a/sys-cluster/lustre/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX lnet.initd 933 BLAKE2B b59c85c589adebc6ff65484546804ba3857a32ce226baab4dca16846b01e828fd68d3e4b84d164bb7a4bd796020ddf17d07748cf52457bd0db8f6188a418556f SHA512 9fa24be73df5671f2396398f67b8945eaf82290b72d6ce99add7dacf58095a028ae2c18e53e005c487a836dab254620fda9c9153825695f1d36af3c9442c7464 -AUX lustre-2.13.0-gcc9.patch 14815 BLAKE2B 11a28292c2c3175e5da2cc0521fe63c5ebc7d3265ee7e23443f755ba8e92f6c3b83f1da71119091e5f706bbf3d90485488db442d16e8b4387479c8cc539ad5e8 SHA512 fcb3de98bcd64f3562444928aa1adc2d935b66a19330a7b8e485e8cd468f8517bb0862b89c468ee243dbf8689675c78fbf565cb371dc6eb95ebd1803bf2a4bf9 -AUX lustre-client.initd 1099 BLAKE2B 89508197c5101e0e382da13720424cf526a6c2503719cab411c3cf03711a8b69bb3e8b043c3555fe3cc01a2ac748234f24b311348941689ded17b708a7c49868 SHA512 b535e81208bed0fadad6e140a6b11ee1786a957f1628a819954de72af02d6794346dda0eb2fdcd8583a9aebd1832e70539d9ca292f2dc34e104f2f61caa8e1f9 -DIST lustre-2.13.0.tar.gz 14598623 BLAKE2B f53b7fa455144f50ed7dd12150b9195fbc6b951a663df2a1a914aeeae79723cc0c0515c0c501fd67769e163b7026a341d679dbddbb590f6c63d1af0498dd44fc SHA512 6da16abc1ecaa6711bf727925ad327164c5b0d9918a7c864be8c3aa36b31b191154139ba718a0f84e4905907c265a0ce2a5394b44f1b85cd90880b3bfcd0d69d -EBUILD lustre-2.13.0-r1.ebuild 2664 BLAKE2B f6f0f5e6593604a85dc09a824a5c6212ef7bc22c213c63e77939241e2234f576e1dc7c1f619b0857f896155c50d0a4175f8929912453cd1ab9676ebb41e380a1 SHA512 a6d8c705115795d43b5d33d08d573c84846cf4aca8dd9df10f9421f191e788b4e00f3db592aba2b113980cc73178e939f4430c47d679c029de87af6b73da4156 -MISC metadata.xml 664 BLAKE2B 1e535086ca083e865613c5f062b805c3c396437807ff0755088fb286af157394b0d5724b0bb1598d893d76a5305df0af81a8e82bad6d321b07ab4334ceeb7e51 SHA512 f80968a4169bdc9e38c06963199a7034a524af0a5534708d00cecb9829b56df5579385edc8baa0e88e71fde550f032e404aa2f816bdffdbee08aa30830e116a3 diff --git a/sys-cluster/lustre/files/lnet.initd b/sys-cluster/lustre/files/lnet.initd deleted file mode 100644 index 44f6a322a4da..000000000000 --- a/sys-cluster/lustre/files/lnet.initd +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Loads lnet module and configures network." - -depend() { - need net - after bootmisc -} - -start() { - if [ "${RC_CMD}" = "restart" ]; - then - einfo "Restarting..." - fi - - ebegin "Loading LNet modules:" - modprobe lnet - eend $* - - ebegin "Bringing up LNet" - lnetctl lnet configure --all - eend $* -} - -stop() { - local LNETMODULES=( "ko2iblnd" "lnet" "libcfs" ) - ebegin "Bringing down LNet" - lnetctl lnet unconfigure --all - eend $* - - einfo "Unloading LNet modules:" - for mod in ${LNETMODULES[@]}; do - ebegin "... ${mod}" - modprobe -r ${mod} - eend $* - done -} - -status() -{ - einfo "LNet status:" - lnetctl net show -} diff --git a/sys-cluster/lustre/files/lustre-2.13.0-gcc9.patch b/sys-cluster/lustre/files/lustre-2.13.0-gcc9.patch deleted file mode 100644 index ea86e923bc98..000000000000 --- a/sys-cluster/lustre/files/lustre-2.13.0-gcc9.patch +++ /dev/null @@ -1,406 +0,0 @@ -From 1bbd0a24bb072c470d5bd93be2010b86b7a80382 Mon Sep 17 00:00:00 2001 -From: James Simmons <jsimmons@infradead.org> -Date: Thu, 21 Nov 2019 14:17:47 -0500 -Subject: [PATCH] LU-12822 uapi: properly pack data structures - -Linux UAPI headers use the gcc attributre __packed__ to ensure -that the data structures are the exact same size on all platforms. -This comes at the cost of potential misaligned accesses to these -data structures which at best cost performance and at worst cause -a bus error on some platforms. To detect potential misaligned -access starting with gcc version 9 a new compile flags was -introduced which is now impacting builds with Lustre. - -Examining the build failures shows most of the problems are due to -packed data structures in the Lustre UAPI header containing -unpacked data structure fields. Packing those missed structures -resolved many of the build issues. The second problem is that the -lustre utilities tend to cast some of its UAPI data structure. -A good example is struct lov_user_md being cast to -struct lov_user_md_v3. To ensure this is properly handled with -packed data structures we need to use the __may_alias__ compiler -attribute. The one exception is struct statx which is defined out -side of Lustre and its unpacked. This requires extra special -handling in user land code due to the described issues in this -comment. - -Fixing this problem exposed an incorrect wiretest for -struct update_op - -Last problem address is the use of __swabXXp() on packed data -structure fields. Because of the potential alignment issues we -have to use __swabXX() functions instead. - -Change-Id: I149c55d3361e893bd890f9c5e9c77c15f81acc1b -Signed-off-by: James Simmons <jsimmons@infradead.org> ---- - lustre/include/uapi/linux/lustre/lustre_idl.h | 6 +-- - .../include/uapi/linux/lustre/lustre_user.h | 14 +++--- - lustre/ptlrpc/wiretest.c | 2 +- - lustre/utils/liblustreapi.c | 50 +++++++++---------- - lustre/utils/liblustreapi_layout.c | 36 ++++++------- - 5 files changed, 54 insertions(+), 54 deletions(-) - -diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h -index db941b24b1..123d73d339 100644 ---- a/lustre/include/uapi/linux/lustre/lustre_idl.h -+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h -@@ -2738,12 +2738,12 @@ struct llog_rec_hdr { - __u32 lrh_index; - __u32 lrh_type; - __u32 lrh_id; --}; -+} __attribute__((packed)); - - struct llog_rec_tail { - __u32 lrt_len; - __u32 lrt_index; --}; -+} __attribute__((packed)); - - /* Where data follow just after header */ - #define REC_DATA(ptr) \ -@@ -3551,7 +3551,7 @@ struct update_op { - __u16 uop_type; - __u16 uop_param_count; - __u16 uop_params_off[0]; --}; -+} __attribute__((packed)); - - struct update_ops { - struct update_op uops_op[0]; -diff --git a/lustre/include/uapi/linux/lustre/lustre_user.h b/lustre/include/uapi/linux/lustre/lustre_user.h -index bec8c97880..440854d175 100644 ---- a/lustre/include/uapi/linux/lustre/lustre_user.h -+++ b/lustre/include/uapi/linux/lustre/lustre_user.h -@@ -324,7 +324,7 @@ struct lu_fid { - * used. - **/ - __u32 f_ver; --}; -+} __attribute__((packed)); - - static inline bool fid_is_zero(const struct lu_fid *fid) - { -@@ -502,7 +502,7 @@ struct ost_id { - } oi; - struct lu_fid oi_fid; - }; --}; -+} __attribute__((packed)); - - #define DOSTID "%#llx:%llu" - #define POSTID(oi) ((unsigned long long)ostid_seq(oi)), \ -@@ -792,7 +792,7 @@ struct lov_user_md_v3 { /* LOV EA user data (host-endian) */ - }; - char lmm_pool_name[LOV_MAXPOOLNAME + 1]; /* pool name */ - struct lov_user_ost_data_v1 lmm_objects[0]; /* per-stripe data */ --} __attribute__((packed)); -+} __attribute__((packed, __may_alias__)); - - struct lov_foreign_md { - __u32 lfm_magic; /* magic number = LOV_MAGIC_FOREIGN */ -@@ -800,7 +800,7 @@ struct lov_foreign_md { - __u32 lfm_type; /* type, see LU_FOREIGN_TYPE_ */ - __u32 lfm_flags; /* flags, type specific */ - char lfm_value[]; --}; -+} __attribute__((packed)); - - #define foreign_size(lfm) (((struct lov_foreign_md *)lfm)->lfm_length + \ - offsetof(struct lov_foreign_md, lfm_value)) -@@ -818,7 +818,7 @@ struct lov_foreign_md { - struct lu_extent { - __u64 e_start; - __u64 e_end; --}; -+} __attribute__((packed)); - - #define DEXT "[%#llx, %#llx)" - #define PEXT(ext) (unsigned long long)(ext)->e_start, (unsigned long long)(ext)->e_end -@@ -979,7 +979,7 @@ struct lmv_user_mds_data { - struct lu_fid lum_fid; - __u32 lum_padding; - __u32 lum_mds; --}; -+} __attribute__((packed, __may_alias__)); - - enum lmv_hash_type { - LMV_HASH_TYPE_UNKNOWN = 0, /* 0 is reserved for testing purpose */ -@@ -1631,7 +1631,7 @@ struct changelog_rec { - __u32 cr_markerflags; /**< CL_MARK flags */ - }; - struct lu_fid cr_pfid; /**< parent fid */ --}; -+} __attribute__ ((packed)); - - /* Changelog extension for RENAME. */ - struct changelog_ext_rename { -diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c -index 3056a0bb7c..c2ce845050 100644 ---- a/lustre/ptlrpc/wiretest.c -+++ b/lustre/ptlrpc/wiretest.c -@@ -5444,7 +5444,7 @@ void lustre_assert_wire_constants(void) - (long long)(int)sizeof(((struct update_params *)0)->up_params)); - - /* Checks for struct update_op */ -- LASSERTF((int)sizeof(struct update_op) == 24, "found %lld\n", -+ LASSERTF((int)sizeof(struct update_op) == 20, "found %lld\n", - (long long)(int)sizeof(struct update_op)); - LASSERTF((int)offsetof(struct update_op, uop_fid) == 0, "found %lld\n", - (long long)(int)offsetof(struct update_op, uop_fid)); -diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c -index 754536f117..0669a876f0 100644 ---- a/lustre/utils/liblustreapi.c -+++ b/lustre/utils/liblustreapi.c -@@ -2154,12 +2154,12 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent, - strcat(path, dent->d_name); - - if (dent->d_type == DT_UNKNOWN) { -- lstatx_t *stx = ¶m->fp_lmd->lmd_stx; -+ lstatx_t stx = param->fp_lmd->lmd_stx; - - rc = get_lmd_info(path, d, NULL, param->fp_lmd, - param->fp_lum_size, GET_LMD_INFO); - if (rc == 0) -- dent->d_type = IFTODT(stx->stx_mode); -+ dent->d_type = IFTODT(stx.stx_mode); - else if (ret == 0) - ret = rc; - -@@ -3985,7 +3985,7 @@ int llapi_file_lookup(int dirfd, const char *name) - * - * If 0 is returned, we need to do another RPC to the OSTs to obtain the - * updated timestamps. */ --static int find_time_check(lstatx_t *stx, struct find_param *param, int mds) -+static int find_time_check(struct statx *stx, struct find_param *param, int mds) - { - int rc = 1; - int rc2; -@@ -4039,13 +4039,13 @@ static int check_obd_match(struct find_param *param) - struct lov_user_ost_data_v1 *objects; - struct lov_comp_md_v1 *comp_v1 = NULL; - struct lov_user_md_v1 *v1 = ¶m->fp_lmd->lmd_lmm; -- lstatx_t *stx = ¶m->fp_lmd->lmd_stx; -+ lstatx_t stx = param->fp_lmd->lmd_stx; - int i, j, k, count = 1; - - if (param->fp_obd_uuid && param->fp_obd_index == OBD_NOT_FOUND) - return 0; - -- if (!S_ISREG(stx->stx_mode)) -+ if (!S_ISREG(stx.stx_mode)) - return 0; - - /* exclude foreign */ -@@ -4358,7 +4358,7 @@ static int find_check_pool(struct find_param *param) - - static int find_check_comp_options(struct find_param *param) - { -- lstatx_t *stx = ¶m->fp_lmd->lmd_stx; -+ lstatx_t stx = param->fp_lmd->lmd_stx; - struct lov_comp_md_v1 *comp_v1, *forged_v1 = NULL; - struct lov_user_md_v1 *v1 = ¶m->fp_lmd->lmd_lmm; - struct lov_comp_md_entry_v1 *entry; -@@ -4376,7 +4376,7 @@ static int find_check_comp_options(struct find_param *param) - comp_v1 = forged_v1; - comp_v1->lcm_entry_count = 1; - entry = &comp_v1->lcm_entries[0]; -- entry->lcme_flags = S_ISDIR(stx->stx_mode) ? 0 : LCME_FL_INIT; -+ entry->lcme_flags = S_ISDIR(stx.stx_mode) ? 0 : LCME_FL_INIT; - entry->lcme_extent.e_start = 0; - entry->lcme_extent.e_end = LUSTRE_EOF; - } -@@ -4504,7 +4504,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp, - struct find_param *param = (struct find_param *)data; - DIR *dir = dirp == NULL ? NULL : *dirp; - int decision = 1; /* 1 is accepted; -1 is rejected. */ -- lstatx_t *stx = ¶m->fp_lmd->lmd_stx; -+ struct statx stx = param->fp_lmd->lmd_stx; - int lustre_fs = 1; - int checked_type = 0; - int ret = 0; -@@ -4594,7 +4594,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp, - if (dir != NULL) { - ret = llapi_file_fget_mdtidx(dirfd(dir), - ¶m->fp_file_mdt_index); -- } else if (S_ISREG(stx->stx_mode)) { -+ } else if (S_ISREG(stx.stx_mode)) { - /* FIXME: we could get the MDT index from the - * file's FID in lmd->lmd_lmm.lmm_oi without - * opening the file, once we are sure that -@@ -4628,7 +4628,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp, - } - - if (param->fp_type && !checked_type) { -- if ((stx->stx_mode & S_IFMT) == param->fp_type) { -+ if ((stx.stx_mode & S_IFMT) == param->fp_type) { - if (param->fp_exclude_type) - goto decided; - } else { -@@ -4640,8 +4640,8 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp, - /* Prepare odb. */ - if (param->fp_obd_uuid || param->fp_mdt_uuid) { - if (lustre_fs && param->fp_got_uuids && -- param->fp_dev != makedev(stx->stx_dev_major, -- stx->stx_dev_minor)) { -+ param->fp_dev != makedev(stx.stx_dev_major, -+ stx.stx_dev_minor)) { - /* A lustre/lustre mount point is crossed. */ - param->fp_got_uuids = 0; - param->fp_obds_printed = 0; -@@ -4655,8 +4655,8 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp, - if (ret) - goto out; - -- param->fp_dev = makedev(stx->stx_dev_major, -- stx->stx_dev_minor); -+ param->fp_dev = makedev(stx.stx_dev_major, -+ stx.stx_dev_minor); - } else if (!lustre_fs && param->fp_got_uuids) { - /* A lustre/non-lustre mount point is crossed. */ - param->fp_got_uuids = 0; -@@ -4758,7 +4758,7 @@ static int cb_find_init(char *path, DIR *parent, DIR **dirp, - - obd_matches: - if (param->fp_check_uid) { -- if (stx->stx_uid == param->fp_uid) { -+ if (stx.stx_uid == param->fp_uid) { - if (param->fp_exclude_uid) - goto decided; - } else { -@@ -4768,7 +4768,7 @@ obd_matches: - } - - if (param->fp_check_gid) { -- if (stx->stx_gid == param->fp_gid) { -+ if (stx.stx_gid == param->fp_gid) { - if (param->fp_exclude_gid) - goto decided; - } else { -@@ -4823,23 +4823,23 @@ obd_matches: - int for_mds; - - for_mds = lustre_fs ? -- (S_ISREG(stx->stx_mode) && stripe_count) : 0; -- decision = find_time_check(stx, param, for_mds); -+ (S_ISREG(stx.stx_mode) && stripe_count) : 0; -+ decision = find_time_check(&stx, param, for_mds); - if (decision == -1) - goto decided; - } - - flags = param->fp_lmd->lmd_flags; - if (param->fp_check_size && -- ((S_ISREG(stx->stx_mode) && stripe_count) || -- S_ISDIR(stx->stx_mode)) && -+ ((S_ISREG(stx.stx_mode) && stripe_count) || -+ S_ISDIR(stx.stx_mode)) && - !(flags & OBD_MD_FLSIZE || - (param->fp_lazy && flags & OBD_MD_FLLAZYSIZE))) - decision = 0; - - if (param->fp_check_blocks && -- ((S_ISREG(stx->stx_mode) && stripe_count) || -- S_ISDIR(stx->stx_mode)) && -+ ((S_ISREG(stx.stx_mode) && stripe_count) || -+ S_ISDIR(stx.stx_mode)) && - !(flags & OBD_MD_FLBLOCKS || - (param->fp_lazy && flags & OBD_MD_FLLAZYBLOCKS))) - decision = 0; -@@ -4884,13 +4884,13 @@ obd_matches: - - convert_lmd_statx(param->fp_lmd, &st, true); - /* Check the time on osc. */ -- decision = find_time_check(stx, param, 0); -+ decision = find_time_check(&stx, param, 0); - if (decision == -1) - goto decided; - } - - if (param->fp_check_size) { -- decision = find_value_cmp(stx->stx_size, param->fp_size, -+ decision = find_value_cmp(stx.stx_size, param->fp_size, - param->fp_size_sign, - param->fp_exclude_size, - param->fp_size_units, 0); -@@ -4899,7 +4899,7 @@ obd_matches: - } - - if (param->fp_check_blocks) { /* convert st_blocks to bytes */ -- decision = find_value_cmp(stx->stx_blocks * 512, -+ decision = find_value_cmp(stx.stx_blocks * 512, - param->fp_blocks, - param->fp_blocks_sign, - param->fp_exclude_blocks, -diff --git a/lustre/utils/liblustreapi_layout.c b/lustre/utils/liblustreapi_layout.c -index e47b303798..720fae814d 100644 ---- a/lustre/utils/liblustreapi_layout.c -+++ b/lustre/utils/liblustreapi_layout.c -@@ -135,11 +135,11 @@ llapi_layout_swab_lov_user_md(struct lov_user_md *lum, int lum_size) - comp_v1 = (struct lov_comp_md_v1 *)lum; - - if (comp_v1 != NULL) { -- __swab32s(&comp_v1->lcm_magic); -- __swab32s(&comp_v1->lcm_size); -- __swab32s(&comp_v1->lcm_layout_gen); -- __swab16s(&comp_v1->lcm_flags); -- __swab16s(&comp_v1->lcm_entry_count); -+ comp_v1->lcm_magic = __swab32(comp_v1->lcm_magic); -+ comp_v1->lcm_size = __swab32(comp_v1->lcm_size); -+ comp_v1->lcm_layout_gen = __swab32(comp_v1->lcm_layout_gen); -+ comp_v1->lcm_flags = __swab16(comp_v1->lcm_flags); -+ comp_v1->lcm_entry_count = __swab16(comp_v1->lcm_entry_count); - ent_count = comp_v1->lcm_entry_count; - } else { - ent_count = 1; -@@ -148,13 +148,13 @@ llapi_layout_swab_lov_user_md(struct lov_user_md *lum, int lum_size) - for (i = 0; i < ent_count; i++) { - if (comp_v1 != NULL) { - ent = &comp_v1->lcm_entries[i]; -- __swab32s(&ent->lcme_id); -- __swab32s(&ent->lcme_flags); -- __swab64s(&ent->lcme_timestamp); -- __swab64s(&ent->lcme_extent.e_start); -- __swab64s(&ent->lcme_extent.e_end); -- __swab32s(&ent->lcme_offset); -- __swab32s(&ent->lcme_size); -+ ent->lcme_id = __swab32(ent->lcme_id); -+ ent->lcme_flags = __swab32(ent->lcme_flags); -+ ent->lcme_timestamp = __swab64(ent->lcme_timestamp); -+ ent->lcme_extent.e_start = __swab64(ent->lcme_extent.e_start); -+ ent->lcme_extent.e_end = __swab64(ent->lcme_extent.e_end); -+ ent->lcme_offset = __swab32(ent->lcme_offset); -+ ent->lcme_size = __swab32(ent->lcme_size); - - lum = (struct lov_user_md *)((char *)comp_v1 + - ent->lcme_offset); -@@ -162,11 +162,11 @@ llapi_layout_swab_lov_user_md(struct lov_user_md *lum, int lum_size) - } - obj_count = llapi_layout_objects_in_lum(lum, lum_size); - -- __swab32s(&lum->lmm_magic); -- __swab32s(&lum->lmm_pattern); -- __swab32s(&lum->lmm_stripe_size); -- __swab16s(&lum->lmm_stripe_count); -- __swab16s(&lum->lmm_stripe_offset); -+ lum->lmm_magic = __swab32(lum->lmm_magic); -+ lum->lmm_pattern = __swab32(lum->lmm_pattern); -+ lum->lmm_stripe_size = __swab32(lum->lmm_stripe_size); -+ lum->lmm_stripe_count = __swab16(lum->lmm_stripe_count); -+ lum->lmm_stripe_offset = __swab16(lum->lmm_stripe_offset); - - if (lum->lmm_magic != LOV_MAGIC_V1) { - struct lov_user_md_v3 *v3; -@@ -177,7 +177,7 @@ llapi_layout_swab_lov_user_md(struct lov_user_md *lum, int lum_size) - } - - for (j = 0; j < obj_count; j++) -- __swab32s(&lod[j].l_ost_idx); -+ lod[j].l_ost_idx = __swab32(lod[j].l_ost_idx); - } - } - --- -2.24.0 - diff --git a/sys-cluster/lustre/files/lustre-client.initd b/sys-cluster/lustre/files/lustre-client.initd deleted file mode 100644 index 80341f46bbb6..000000000000 --- a/sys-cluster/lustre/files/lustre-client.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Load lustre modules" - -extra_commands="checkmodule" - -depend() { - need lnet - before netmount -} - -checkmodule() { - local LOADED="$(lctl modules | awk -F"/" /lustre/'{print $2F}')" - for mod in ${LOADED[@]}; do - ewarn "Module is still loaded: ${mod}" - eend $* - done -} - -start() { - if [ "${RC_CMD}" = "restart" ]; - then - einfo "Restarting Lustre..." - checkmodule - fi - - ebegin "Loading Lustre modules..." - modprobe lustre - eend $* -} - -stop() { - local LMODULES=( "lustre" "osc" "mgc" "lmv" "fld" "mdc" "fid" "lov" "ptlrpc" ) - ebegin "Trying to unmount all Lustre fs" - umount -a -t lustre - eend $* - einfo "Unloading lustre modules:" - for mod in ${LMODULES[@]}; do - ebegin "... ${mod}" - modprobe -r ${mod} - eend $* - done - - checkmodule -} diff --git a/sys-cluster/lustre/lustre-2.13.0-r1.ebuild b/sys-cluster/lustre/lustre-2.13.0-r1.ebuild deleted file mode 100644 index 23c6d7e1ab9b..000000000000 --- a/sys-cluster/lustre/lustre-2.13.0-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WANT_AUTOCONF="2.5" -WANT_AUTOMAKE="1.15" -WANT_LIBTOOL="latest" - -if [[ ${PV} = *9999* ]]; then - scm="git-r3" - SRC_URI="" - EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git" - EGIT_BRANCH="master" -else - scm="" - SRC_URI="https://dev.gentoo.org/~alexxy/distfiles/${P}.tar.gz" - KEYWORDS="~amd64" -fi - -SUPPORTED_KV_MAJOR=4 -SUPPORTED_KV_MINOR=19 - -inherit ${scm} autotools linux-info linux-mod toolchain-funcs flag-o-matic - -DESCRIPTION="Lustre is a parallel distributed file system" -HOMEPAGE="http://wiki.whamcloud.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+client +utils +modules +dlc server readline tests" - -RDEPEND=" - virtual/awk - dlc? ( dev-libs/libyaml ) - readline? ( sys-libs/readline:0 ) - server? ( - >=sys-fs/zfs-kmod-0.8 - >=sys-fs/zfs-0.8 - ) -" -DEPEND="${RDEPEND} - dev-python/docutils - virtual/linux-sources" - -REQUIRED_USE=" - client? ( modules ) - server? ( modules )" - -PATCHES=( "${FILESDIR}/${P}-gcc9.patch" ) - -pkg_pretend() { - KVSUPP=${SUPPORTED_KV_MAJOR}.${SUPPORTED_KV_MINOR}.x - if kernel_is gt ${SUPPORTED_KV_MAJOR} ${SUPPORTED_KV_MINOR}; then - eerror "Unsupported kernel version! Latest supported one is ${KVSUPP}" - die - fi -} - -pkg_setup() { - filter-mfpmath sse - filter-mfpmath i386 - filter-flags -msse* -mavx* -mmmx -m3dnow - - linux-mod_pkg_setup - ARCH="$(tc-arch-kernel)" - ABI="${KERNEL_ABI}" -} - -src_prepare() { - if [ ${#PATCHES[0]} -ne 0 ]; then - eapply ${PATCHES[@]} - fi - - eapply_user - if [[ ${PV} == "9999" ]]; then - # replace upstream autogen.sh by our src_prepare() - local DIRS="libcfs lnet lustre snmp" - local ACLOCAL_FLAGS - for dir in $DIRS ; do - ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir/autoconf" - done - _elibtoolize -q - eaclocal -I config $ACLOCAL_FLAGS - eautoheader - eautomake - eautoconf - fi -} - -src_configure() { - local myconf - if use server; then - SPL_PATH=$(basename $(echo "${EROOT}/usr/src/spl-"*)) \ - myconf="${myconf} --with-spl=${EROOT}/usr/src/${SPL_PATH} \ - --with-spl-obj=${EROOT}/usr/src/${SPL_PATH}/${KV_FULL}" - ZFS_PATH=$(basename $(echo "${EROOT}/usr/src/zfs-"*)) \ - myconf="${myconf} --with-zfs=${EROOT}/usr/src/${ZFS_PATH} \ - --with-zfs-obj=${EROOT}/usr/src/${ZFS_PATH}/${KV_FULL}" - fi - econf \ - ${myconf} \ - --without-ldiskfs \ - --with-linux="${KERNEL_DIR}" \ - $(use_enable dlc) \ - $(use_enable client) \ - $(use_enable utils) \ - $(use_enable modules) \ - $(use_enable server) \ - $(use_enable readline) \ - $(use_enable tests) -} - -src_compile() { - default -} - -src_install() { - default - newinitd "${FILESDIR}/lnet.initd" lnet - newinitd "${FILESDIR}/lustre-client.initd" lustre-client -} diff --git a/sys-cluster/lustre/metadata.xml b/sys-cluster/lustre/metadata.xml deleted file mode 100644 index b824eb0d7684..000000000000 --- a/sys-cluster/lustre/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cluster@gentoo.org</email> - <name>Gentoo Cluster Project</name> - </maintainer> - <maintainer type="person"> - <email>alexxy@gentoo.org</email> - <name>Alexey Shvetsov</name> - </maintainer> - <use> - <flag name="client">Enable kernel client modules</flag> - <flag name="dlc">Enable Dynamic LNET Configuration</flag> - <flag name="server">Enable kernels server modules</flag> - <flag name="utils">Enable lustre utils</flag> - <flag name="tests">Enable installation of tests</flag> - </use> -</pkgmetadata> |