From 80208fb578cf92cc308906660ca6d7860c6b2a1f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Mar 2018 16:53:27 +0000 Subject: gentoo resync : 09.03.2018 --- sys-cluster/ceph/Manifest | 15 +- sys-cluster/ceph/ceph-12.2.1.ebuild | 2 +- sys-cluster/ceph/ceph-12.2.2-r1.ebuild | 2 +- sys-cluster/ceph/ceph-12.2.2.ebuild | 2 +- sys-cluster/ceph/ceph-12.2.4.ebuild | 304 +++++++++++++++++++++ sys-cluster/ceph/files/boost-site-config.jam | 11 + .../ceph-12.2.4-boost-build-none-options.patch | 26 ++ .../ceph/files/ceph-12.2.4-boost-sonames.patch | 152 +++++++++++ sys-cluster/ceph/files/ceph-12.2.4-cflags.patch | 38 +++ .../ceph/files/ceph-12.2.4-rocksdb-cflags.patch | 11 + sys-cluster/ceph/metadata.xml | 9 +- 11 files changed, 561 insertions(+), 11 deletions(-) create mode 100644 sys-cluster/ceph/ceph-12.2.4.ebuild create mode 100644 sys-cluster/ceph/files/boost-site-config.jam create mode 100644 sys-cluster/ceph/files/ceph-12.2.4-boost-build-none-options.patch create mode 100644 sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch create mode 100644 sys-cluster/ceph/files/ceph-12.2.4-cflags.patch create mode 100644 sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch (limited to 'sys-cluster/ceph') diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 8e336ac3d7be..a1a4b7e81572 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,4 +1,5 @@ AUX README.gentoo 1085 BLAKE2B 761a88dbcb3126a47ae6257409d47c3e936743d102430cfc71fac90ea4b8ed876af9815b445e06d88ef407a47963eacd8027cf912ab3fcde724af22fd6a43741 SHA512 cee1b5fb9823333eda0750c04db0c56d71cca1cbf6fed6887ac4ba68949114df74aace3861343bdacd2a1dc4fc38932de805cc03074f981d26891673e454f250 +AUX boost-site-config.jam 688 BLAKE2B 38cc433df4186c35fe5cb45ec9742c0ef6ae11d10d550da6fcfe00e93a13f6b45dee88e4899ac7ddd38972eb095aeec0b5f6fe602bc2922b2c64f86488002ebd SHA512 f2458e38af5604bc0dd637df43f703fc02585bd2405d70a6ce38375443db2c72092c563c75ab267f64e7d8443ba3e1e816af0e1014be9d985d01599bec545b84 AUX ceph-10.2.0-dont-use-virtualenvs.patch 3253 BLAKE2B 099d80efbccfb4ce8ac6c7809c70b2fb66b44f3c6ee5fbea64988576320df9b5ea6c420088fc4dba2d899c9410979dae3a7609676271c53b1eaef5187ab33cfa SHA512 f6351c97ca6766aa5eb4ebb91bc013aaf8222029743c95f5c88b9bd8a6caca48908315e8850ffc83651573377b48e5feb170c310b42e2447fec739379169b500 AUX ceph-10.2.1-libzfs.patch 440 BLAKE2B 8d0c46d54917a0d8f61f913562b4e8f9a54efd04ccf548a2290832a765f69b4db120bab6e72b94295bf1fd3214512db8c598af6ec514b1e9e4361f964b7fe4d9 SHA512 5afe85113f310b86a13fb18ba57030d50ae5bd9afbf4d6f5aacd7cca415dd13544522c5d903eb58ec90cc0f6ae2cbb022941debe7036d1b7fa6c5af26af9b9db AUX ceph-10.2.1-unbundle-jerasure.patch 16190 BLAKE2B 6a5969ca39389ae26ed83c7a76c69adf049f32d6f183d602a460d844427d18825846d034b9753a359fd18bb19828532ba770318fd8c9c0294954d68b10c1e0ff SHA512 8076a69bb81f89f8892576c4e2ceb03131cbd7ffee82a0d4d66016120f6c79b906172d1a1c30d7642a32ef7afd46d77d7311b65ca55d065995f305cb0e89485a @@ -20,6 +21,10 @@ AUX ceph-12.2.0-cflags.patch 536 BLAKE2B 9eb8dc48db09d35f86de280a36763b7a56d980a AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 BLAKE2B 684dfd301a144e2958497bf588515b0319d4e2c5cc5a6c5949d4c2c6f0d41f94aca2c43c020285f4b467f42f9f9a3944ce3a5600dc95e3b8443c8420cfb76128 SHA512 ecf4067776a146cf2aaf0b83298e508a6073147e555f4f9ba73cf2d9e0fe26d9ea72fff8af1c67eaa436e30d32ed260f75683c7d77b27a88fbb098b561d13f0d AUX ceph-12.2.1-systemd-unitdir.patch 345 BLAKE2B b97856edd071beb28e46301e97f996176dd62b6824ccc2154b7640ce629b1c0698c2d79e074a2df3af91ab34d6f7e84b2a5a04d41d8fa3b64b571a016ab14f19 SHA512 a29373704f645f5b52597f5482fb4538f3d335bb1020c206a089ba58707f988cf42d335f17a36911f373936f8e769613c3d3fa98f55c1fd91d433d036b769bcc AUX ceph-12.2.2-build-without-radosgw.patch 999 BLAKE2B 2e4d995f82c43ca3d96c3e5f9acd8bf827b85055f4d558688de899b52573d7445ed72979bec5cd074b6ed3a7139227605571f79a5fbc5b2f0a2ce942d11d2296 SHA512 8ff2efef0bcf0fcf339cefeee6a54384ea6a2c219bc8b171e2306ca9043ffd9d95468c567966fabb5c1373adb00b4fe036daddb7715c232c029cda1e3d21bb83 +AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a00a4fe595f900d9f676769614576c059513299c05cae1c982db8bdd3a571c04ace1ff1ea6171631c1373c408f465261b73e05f66580e SHA512 6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae +AUX ceph-12.2.4-boost-sonames.patch 5145 BLAKE2B 70609fbcf98c556bc681a27da37abaf0178f0d60850f3d5dd7806f71dcc21affd103bbc4ffcd21be7ebe6a82a04eab5a46548aeb1d18ad398860e14f50b86ec6 SHA512 d8a69c34c02848ba918bf65f318bb02f27cbbbd618a337cc21153cad4ab33a07dfef27d8cfb1d2839b145a245483c57dfdbddb87061a5f9ce215fb6df94ef591 +AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e +AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48 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 @@ -43,6 +48,7 @@ DIST ceph-10.2.7.tar.gz 14518491 BLAKE2B c81fb852680fa24dd30224d276dde3ceb9a5c94 DIST ceph-10.2.9.tar.gz 14550219 BLAKE2B 5ec20b88badefc6ed793c2538ffd9436e4b23877aa9d5ac7348a9d7b353e3c6c759677f6b77635c4f2017cccfbd93636d0e3bda6a1d793f6881b52aa3f3b2758 SHA512 1d59146614aa87ca551b05b795a684071a3cfb4ce6013e978ba650403c6732b2aa13f3c3cc191e6a1ea34b4631c82e97700593c24e200c41ec2f2b43b3ef5547 DIST ceph-12.2.1.tar.gz 148738778 BLAKE2B df4bea1ad552ab2361174c1e2f285f42b4a07ad23daf4eb9baa9e21e5513f6508b141f7b819f75918d2c55e4b812ba9985b9414496e7c1eaf28c68f9a101c3f5 SHA512 ec2623c1f6ab563c6fd0bb5fd046c78528fdbedca7cde347c92a9b15005d2ab2b1a46d7294e93f56933386462f1066750285109aafb6bf94f7d5bcdb7214d8a8 DIST ceph-12.2.2.tar.gz 148763718 BLAKE2B 5c9a56bc536b723ca3a6a0aa68c7f456032c892716167dfa213cda4964e3a45e970efe6dd67e5c43ef6f6018bd9367e0c890de270acccf3217b848b58cb98488 SHA512 89b166dc4b58e0110ebe0147eef9f47e1090ccee01702b3f72cfbdca856d02bf03b2663de9e88c84b21a2a61f8f92211e217a05b8bdcf7d5de3158adbe49db88 +DIST ceph-12.2.4.tar.gz 78694838 BLAKE2B 862c275eb5e42065b2f42d417f8efd2ee8ee67c19575eb19bc799d5923d0720fa4810e1c51915fee6f96a44d433059ca6b180861013b735287751ad24235e611 SHA512 ce9ec49e8693d11345adb3a219763cc76b626db2c26d8d9ba08ff0a4d6fdeb08739da29bb87ff0946fed8e6fd55c8db0672cb286f7ebb90cf2e11a47042ba5d6 EBUILD ceph-10.2.10-r1.ebuild 7632 BLAKE2B dbd9ddb6dc6c196af4553c24bd0beb33e409334d72fb5838c98343bf7b3d807f657aac1586fa156edf8c5378c69cd1b072fdac03cdee0d9b4154e97d0ddbc647 SHA512 94dea0f2b98fda249641d6f60d673dbf9793ee4205ff0b10267604c0022ceef8640eab54be3c39afd84a07bd0a29b2a667d140a4010bb3d8c5c0134dfb4a9eb7 EBUILD ceph-10.2.10-r2.ebuild 7632 BLAKE2B cb306ece7fb2d9c3fc87fd75a06adeba5f6b96f459d957be09429a2c6e480d37c48785b143a8960c46882ed81ebdea1f700e8f660d94a6aa55bb629de5084dee SHA512 fbbf3070b2ac2358b49747455adf999385eecd63c6063a5a23353743d77251bf2fb7dd2c197a9a30f2859080110ae44f0b8f52699cf58a741d44414405a6218d EBUILD ceph-10.2.3-r2.ebuild 6106 BLAKE2B 046cd931c80f6798b1e52b79fc2acf10753c0983ae4fdfea16c22f63f4a3c17586b9ede8706316ec144309ade8e215dc36778e37ca79b5d9f6478d810008741e SHA512 817064150d5a36d16b899a9d4be37a746a5f0108d73d5fb136e3faee1624763033376087488e30bed9ceb45d1e64f8cebeeadef7b53bd2055e067f271cee328f @@ -51,7 +57,8 @@ EBUILD ceph-10.2.9-r1.ebuild 7382 BLAKE2B a7a87e3739c11b35c4368e2b9b80a079fd380d EBUILD ceph-10.2.9-r2.ebuild 7467 BLAKE2B db0b1e3637de862cd7a29186e9e027c6f4c5c037bd4242f2d6b4ae467efb3651fce717d9a7b5ed2e2c6894e06930c95843d10896ec710e83cee6df3997f652b3 SHA512 91a5fa648a7a57ec5fbf32c5aecabdde7d2d2211bd0453673e8db364de4869899add700b191bf38e37237cb35133bdbc2415b92c766c9c5e25f467854a4eb6a3 EBUILD ceph-10.2.9-r3.ebuild 8252 BLAKE2B cd99c41910ad34eec65c6702f8967d0e1b1e6e28766e24d3fd125e70bbccd3aa7ff210984855c8bd8c5a3472e1138aecd175c53be8662df119dac437ac6ba2df SHA512 5025aeae8794d66a3bb67f15dad332a8f5c004d911d1ea3bac7fd1d7090f3fc6eccae46c4724690814a5350852914ff8cb91d06a6efb7307550291a6035f26bf EBUILD ceph-10.2.9.ebuild 7150 BLAKE2B a9300913b99b4770fc85dec74cdb38b18b466272d75901fd5387b248de5b5ff39c0553b3ddbd89649c6c0008d06200b1ecefa9e54b3cc5d2b6edad3bc98b851a SHA512 9b9b506446f88961d26d3e06100cce48c8cdca51b5634aef0c5a85268c03f9ceea8bc84347589344f08093aa98627673a7cdd1c27abeba24674efb185b2e69c9 -EBUILD ceph-12.2.1.ebuild 7345 BLAKE2B c7ab34936a4addabc9b5de459427deac56950749ff11c2bcf580082d673fe2e765390119f8d62cf758e810b967bc441a5edfc10b30d32815aec8310e2292eab6 SHA512 04baa2dea342f463b54bede0e7a1286ae70f7fe326d043753ab8c3b43816d41dd98238c18bb90f485492e7354f4bff702370706a2192027a16929e0e83456be0 -EBUILD ceph-12.2.2-r1.ebuild 7322 BLAKE2B 7ce77b6fb14da72b9f6d8a665b6388b127d1cd6adcca124c9e4e4e3526690e20c786aaac6dc9dd7075928e2f87d4a76134db2c58dbd81bd34e9b1c1f8df17f8a SHA512 b0697db603c2811ffe2f104f7f87ea37dc2e7be4617cca07a31a2e1129251d22c0bb815788ec0e29c69f16204d0a48fc619d38dcf7108fa9cedb94cc295336ad -EBUILD ceph-12.2.2.ebuild 7322 BLAKE2B 7b062d1a2d81e2758914b441172001d1016d708a9aed2eab8bccb7963b254b5164c91856d9cfb212a07beb7a2fb4c2409377655d8dced83a16c1d61d34543c85 SHA512 67e1e9e14c53b29965cd515fa8d3719575db37954b50c4f2cd917ab136798a6d7aa7f76f63d0e6ac42ff97aeae21267cd5f65703cade62d3b1814cc4005c4829 -MISC metadata.xml 1528 BLAKE2B a4e033f9a026f2b9d8c0f4660b3b448ac1f82f81997a7e60102b6df4d86d55340d85a2b0384d57dbef49e056f8ad24bbc3f6f6d5f95d63789060f70ac6c3bd45 SHA512 d0100132ac9d9ac669805f0483b0ede206aac288b92b31b81af5a1242cafdeb0e90f0662f189b490321e0910b08a1141500fdd644ea5b4bd2ebf0476ee605e09 +EBUILD ceph-12.2.1.ebuild 7338 BLAKE2B cd4cccedaeb34e9057da645ba7640e1577b593dda3f3bf579c9f191a1c0cca616aa92f9c7dc2768bbf0ff2720ce62295ccd0bcf518a69f1d449b1bafb29473b1 SHA512 db604a52bc5302e0efee5cb3cae654dff61b7d9709d2f4ec0505ed56f7f82b3f7f7387f34c0738ed3143bdb77c90086b922e7bc891f3bc246149354644ab2179 +EBUILD ceph-12.2.2-r1.ebuild 7315 BLAKE2B 4ea06a4679902338bcfc631f16c3d3fe60efa59baee88d06579fbc54b4ffe12ac6b003551edbbd18f1ee3c42814c64f4efa948dec2a2881231620b2f0a5acc91 SHA512 806d2a6ce722da06e6430bc4e7b6091e858333b84631690d3b6702c0c158618a09368ec352b563c437ce8253cdf38a487011b6601ee78ce4adfe148191c303f4 +EBUILD ceph-12.2.2.ebuild 7315 BLAKE2B dee5111ca1f52b26f49f27384bbff20d339ab9dd9ad4eba77709f2f9af59c42480f1d55324e8691b9b86b7ee2615a68c473d2d389355c7d57fc2b2b19672f980 SHA512 af0421ed063be53baa3daef7a8ec0b9c7bfdf66180afa483ed3459a664fce463b4de65a23869577f616ff4149a40e8223ed27de792bbb2a9b001bf9baaed39ab +EBUILD ceph-12.2.4.ebuild 7830 BLAKE2B 0fe909963c63f532cb7741f5945c53dcd848132ce8615e7da02036d81f237c78802d259de5ffb88197c434f68afdbf7c4d19b157ed9618d85e7c1668a692861f SHA512 d3fa0d44c471f542b8fd9a37823a16440719d163e6e8ce34980bb2021ac6b31432ac3a7032908807e87208b2324aff38f77b863f593e9bf25c46cb94d0b9e606 +MISC metadata.xml 1635 BLAKE2B a18aec5797d25bf4440d2900663e87b2a2b8ce9b7a64584bd4bb827e3a678d2ce67853d745b1d660f7309ca9004301fdd6dc2f6e3ac73c54a45945027185075f SHA512 38ceed3b5f66d428ef804f9bfeca3174ee8c54825c926c7426f1484647ea9141c2cda276c190b78299f6d99831d6242e2132524bc86cc032b82b3accae3224b2 diff --git a/sys-cluster/ceph/ceph-12.2.1.ebuild b/sys-cluster/ceph/ceph-12.2.1.ebuild index 9e8142ef5698..d7acf97b5750 100644 --- a/sys-cluster/ceph/ceph-12.2.1.ebuild +++ b/sys-cluster/ceph/ceph-12.2.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Ceph distributed filesystem" diff --git a/sys-cluster/ceph/ceph-12.2.2-r1.ebuild b/sys-cluster/ceph/ceph-12.2.2-r1.ebuild index 370a0220f867..f90261d5bc36 100644 --- a/sys-cluster/ceph/ceph-12.2.2-r1.ebuild +++ b/sys-cluster/ceph/ceph-12.2.2-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Ceph distributed filesystem" diff --git a/sys-cluster/ceph/ceph-12.2.2.ebuild b/sys-cluster/ceph/ceph-12.2.2.ebuild index 7040667f3001..664f9e63d0bf 100644 --- a/sys-cluster/ceph/ceph-12.2.2.ebuild +++ b/sys-cluster/ceph/ceph-12.2.2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Ceph distributed filesystem" diff --git a/sys-cluster/ceph/ceph-12.2.4.ebuild b/sys-cluster/ceph/ceph-12.2.4.ebuild new file mode 100644 index 000000000000..bc3dd0a718aa --- /dev/null +++ b/sys-cluster/ceph/ceph-12.2.4.ebuild @@ -0,0 +1,304 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) +DISTUTILS_OPTIONAL=1 + +inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ + python-r1 udev user readme.gentoo-r1 systemd + +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 ~x86" +fi + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="https://ceph.com/" + +LICENSE="LGPL-2.1 CC-BY-SA-1.0 GPL-2 BSD Boost-1.0 MIT" +SLOT="0" + +CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) + +IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl" +IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" +IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +# unbundling code commented out pending bugs 584056 and 584058 +#>=dev-libs/jerasure-2.0.0-r1 +#>=dev-libs/gf-complete-2.0.0 +COMMON_DEPEND=" + virtual/libudev:= + app-arch/bzip2:=[static-libs?] + app-arch/lz4:=[static-libs?] + app-arch/snappy:=[static-libs?] + app-arch/zstd:=[static-libs?] + app-misc/jq:=[static-libs?] + dev-libs/crypto++:=[static-libs?] + dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] + dev-libs/libaio:=[static-libs?] + dev-libs/libxml2:=[static-libs?] + sys-apps/keyutils:=[static-libs?] + sys-apps/util-linux:=[static-libs?] + sys-libs/zlib:=[static-libs?] + babeltrace? ( dev-util/babeltrace ) + ldap? ( net-nds/openldap:=[static-libs?] ) + lttng? ( dev-util/lttng-ust:= ) + nss? ( dev-libs/nss:= ) + fuse? ( sys-fs/fuse:0=[static-libs?] ) + ssl? ( dev-libs/openssl:=[static-libs?] ) + xfs? ( sys-fs/xfsprogs:=[static-libs?] ) + zfs? ( sys-fs/zfs:=[static-libs?] ) + radosgw? ( + dev-libs/expat:=[static-libs?] + dev-libs/openssl:=[static-libs?] + net-misc/curl:=[static-libs?] + ) + system-boost? ( + >=dev-libs/boost-1.66:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ) + jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) + !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) + ${PYTHON_DEPS} + " +DEPEND="${COMMON_DEPEND} + app-arch/cpio + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) + dev-python/cython[${PYTHON_USEDEP}] + dev-python/sphinx + dev-util/gperf + dev-util/valgrind + sys-apps/which + sys-devel/bc + virtual/pkgconfig + test? ( + dev-python/tox[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + sys-apps/grep[pcre] + sys-fs/btrfs-progs + )" +RDEPEND="${COMMON_DEPEND} + net-misc/socat + sys-apps/gptfdisk + sys-block/parted + sys-fs/cryptsetup + sys-fs/lvm2 + !/dev/null || die + 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-utils_src_make all + + # we have to do this here to prevent from building everything multiple times + BUILD_DIR="${CMAKE_BUILD_DIR}" 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="${D}" emake install + popd >/dev/null || die +} + +src_install() { + cmake-utils_src_install + python_foreach_impl python_install + + prune_libtool_files --all + + exeinto /usr/$(get_libdir)/ceph + newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ceph.logrotate ${PN} + + keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat + + fowners -R ceph:ceph /var/lib/ceph /var/log/ceph + + newinitd "${FILESDIR}/rbdmap.initd" rbdmap + newinitd "${FILESDIR}/${PN}.initd-r7" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r4" ${PN} + + insinto /etc/sysctl.d + newins "${FILESDIR}"/sysctld 90-${PN}.conf + + use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc + + # units aren't installed by the build system unless systemd is enabled + # so no point installing these with the USE flag disabled + if use systemd; then + systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ + "ceph-mds@.service" + + systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ + "ceph-osd@.service" + fi + + udev_dorules udev/*.rules + + readme.gentoo_create_doc + + python_setup 'python2*' + + # bug #630232 + sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ + || die "sed failed" + + python_fix_shebang "${ED}"/usr/{,s}bin/ + + # python_fix_shebang apparently is not idempotent + sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ + "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-cluster/ceph/files/boost-site-config.jam b/sys-cluster/ceph/files/boost-site-config.jam new file mode 100644 index 000000000000..8349b96eb44b --- /dev/null +++ b/sys-cluster/ceph/files/boost-site-config.jam @@ -0,0 +1,11 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) + +# Define two new variants to be used when building boost (or separate boost-libs) +# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols +# values "none" which are not part of the official boost distribution. +# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS! +variant gentoorelease : release : none none shared ; +variant gentoodebug : debug : none on shared ; + diff --git a/sys-cluster/ceph/files/ceph-12.2.4-boost-build-none-options.patch b/sys-cluster/ceph/files/ceph-12.2.4-boost-build-none-options.patch new file mode 100644 index 000000000000..6e3ad413e99d --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.4-boost-build-none-options.patch @@ -0,0 +1,26 @@ +diff --git a/src/boost/tools/build/src/tools/features/debug-feature.jam b/src/boost/tools/build/src/tools/features/debug-feature.jam +index 04958f9a..38b6acf1 100644 +--- a/src/boost/tools/build/src/tools/features/debug-feature.jam ++++ b/src/boost/tools/build/src/tools/features/debug-feature.jam +@@ -8,7 +8,7 @@ + import feature ; + + feature.feature debug-symbols +- : on off ++ : on off none + : propagated ; + + feature.feature profiling +diff --git a/src/boost/tools/build/src/tools/features/optimization-feature.jam b/src/boost/tools/build/src/tools/features/optimization-feature.jam +index 761f76f1..fb2a5dec 100644 +--- a/src/boost/tools/build/src/tools/features/optimization-feature.jam ++++ b/src/boost/tools/build/src/tools/features/optimization-feature.jam +@@ -8,7 +8,7 @@ + import feature ; + + feature.feature optimization +- : off speed space ++ : off none speed space + : propagated ; + + feature.feature inlining diff --git a/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch new file mode 100644 index 000000000000..59c645dea95c --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch @@ -0,0 +1,152 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7aa8a4392e..111f669f2e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -622,13 +622,13 @@ set(ceph_common_objs + $) + set(ceph_common_deps + json_spirit erasure_code rt ${LIB_RESOLV} +- Boost::thread +- Boost::system +- Boost::regex +- Boost::random +- Boost::program_options +- Boost::date_time +- Boost::iostreams ++ boost_thread ++ boost_system ++ boost_regex ++ boost_random ++ boost_program_options ++ boost_date_time ++ boost_iostreams + ${BLKID_LIBRARIES} + ${Backtrace_LIBRARIES} + ${BLKIN_LIBRARIES} +@@ -712,7 +712,7 @@ if (WITH_MGR) + $) + target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}") + target_link_libraries(ceph-mgr osdc client global-static common +- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) ++ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) + install(TARGETS ceph-mgr DESTINATION bin) + endif (WITH_MGR) + +@@ -885,7 +885,7 @@ set(ceph_mds_srcs + ceph_mds.cc) + add_executable(ceph-mds ${ceph_mds_srcs}) + target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common +- Boost::thread) ++ boost_thread) + install(TARGETS ceph-mds DESTINATION bin) + + add_subdirectory(erasure-code) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index f3999e3b01..0ce7fca1ba 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -148,7 +148,7 @@ add_executable(ceph_omapbench + ) + target_link_libraries(ceph_omapbench + librados +- Boost::program_options ++ boost_program_options + global + ${BLKID_LIBRARIES} + ${CMAKE_DL_LIBS} +@@ -202,7 +202,7 @@ if(${WITH_RADOSGW}) + cls_rgw_client + cls_user_client + cls_lock_client +- Boost::regex ++ boost_regex + ${BLKID_LIBRARIES} + ${CURL_LIBRARIES} + ${EXPAT_LIBRARIES} +@@ -232,7 +232,7 @@ if(${WITH_RADOSGW}) + cls_rgw_client + cls_user_client + cls_lock_client +- Boost::regex ++ boost_regex + ${BLKID_LIBRARIES} + ${CURL_LIBRARIES} + ${EXPAT_LIBRARIES} +diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt +index 9fba701e05..da3cbcfe96 100644 +--- a/src/test/bench/CMakeLists.txt ++++ b/src/test/bench/CMakeLists.txt +@@ -8,7 +8,7 @@ set(smalliobench_srcs + add_executable(ceph_smalliobench + ${smalliobench_srcs} + ) +-target_link_libraries(ceph_smalliobench librados Boost::program_options global ++target_link_libraries(ceph_smalliobench librados boost_program_options global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + # ceph_smalliobenchrbd +@@ -27,7 +27,7 @@ if(WITH_RBD) + librados + os + global +- Boost::program_options ++ boost_program_options + ${BLKID_LIBRARIES} + ${CMAKE_DL_LIBS} + ) +@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs + add_executable(ceph_smalliobenchfs + ${ceph_smalliobenchfs_srcs} + ) +-target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global ++target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + # ceph_smalliobenchdumb +@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs + add_executable(ceph_smalliobenchdumb + ${smalliobenchdumb_srcs} + ) +-target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global ++target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + # ceph_tpbench +@@ -73,7 +73,7 @@ set(tpbench_srcs + add_executable(ceph_tpbench + ${tpbench_srcs} + ) +-target_link_libraries(ceph_tpbench librados Boost::program_options global ++target_link_libraries(ceph_tpbench librados boost_program_options global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + install(TARGETS +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index 7502085895..1a430c201a 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -23,13 +23,13 @@ target_link_libraries(ceph_radosacl librados global) + install(TARGETS ceph_radosacl DESTINATION bin) + + add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) +-target_link_libraries(ceph-osdomap-tool os global Boost::program_options) ++target_link_libraries(ceph-osdomap-tool os global boost_program_options) + install(TARGETS ceph-osdomap-tool DESTINATION bin) + + add_executable(ceph-monstore-tool + ceph_monstore_tool.cc + ../mgr/mgr_commands.cc) +-target_link_libraries(ceph-monstore-tool os global Boost::program_options) ++target_link_libraries(ceph-monstore-tool os global boost_program_options) + install(TARGETS ceph-monstore-tool DESTINATION bin) + install(PROGRAMS + ceph-monstore-update-crush.sh +@@ -40,7 +40,7 @@ add_executable(ceph-objectstore-tool + ceph_objectstore_tool.cc + rebuild_mondb.cc + RadosDump.cc) +-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) + if(WITH_FUSE) + target_link_libraries(ceph-objectstore-tool fuse) + endif(WITH_FUSE) diff --git a/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch new file mode 100644 index 000000000000..3535d8cf4369 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake +index c7cd39a110..e7b8115485 100644 +--- a/cmake/modules/BuildBoost.cmake ++++ b/cmake/modules/BuildBoost.cmake +@@ -29,7 +29,7 @@ function(do_build_boost version) + else() + list(APPEND boost_features "address-model=32") + endif() +- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX ++ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX + list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") + + string(REPLACE ";" "," boost_with_libs "${Boost_BUILD_COMPONENTS}") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7aa8a4392e..c7543a62bd 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -808,6 +808,7 @@ install(TARGETS ceph-mon DESTINATION bin) + + if (NOT WITH_SYSTEM_ROCKSDB) + set(ROCKSDB_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON) ++ list(APPEND ROCKSDB_CMAKE_ARGS -DDISABLE_WARNING_AS_ERROR=ON) + + if(ALLOCATOR STREQUAL "jemalloc") + list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_JEMALLOC=ON) +diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt +index d9d2b6e560..1b2099fcbd 100644 +--- a/src/compressor/zstd/CMakeLists.txt ++++ b/src/compressor/zstd/CMakeLists.txt +@@ -1,7 +1,7 @@ + # zstd + + # libzstd - build it statically +-set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable -O3) ++set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable $ENV{CFLAGS}) + + include(ExternalProject) + ExternalProject_Add(zstd_ext diff --git a/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch new file mode 100644 index 000000000000..d744318cd111 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch @@ -0,0 +1,11 @@ +--- ceph-12.2.4.orig/src/rocksdb/CMakeLists.txt 2018-03-05 19:06:21.016923872 -0800 ++++ ceph-12.2.4/src/rocksdb/CMakeLists.txt 2018-03-05 19:09:01.798721666 -0800 +@@ -147,7 +147,7 @@ + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fno-omit-frame-pointer") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer") + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG("-momit-leaf-frame-pointer" HAVE_OMIT_LEAF_FRAME_POINTER) + if(HAVE_OMIT_LEAF_FRAME_POINTER) diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml index 4194415c72fd..8ed7a4c83e47 100644 --- a/sys-cluster/ceph/metadata.xml +++ b/sys-cluster/ceph/metadata.xml @@ -14,20 +14,21 @@ Gentoo Cluster Project -Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. - + Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. + + Add support for LTTng babeltrace Use dev-libs/crypto++ for cryptography Build support for cephfs, a POSIX compatible filesystem built on top of ceph Build fuse client + Use dev-libs/jemalloc for allocations Use libatomic instead of builtin atomic operations Use libaio as asynchronous input/output library Add support for LTTng - Add support for LTTng babeltrace Build the ceph-mgr daemon Use dev-libs/nss for cryptography Add radosgw support - Use dev-libs/jemalloc for allocations + Use system dev-libs/boost instead of the bundled one Add xfs support Add zfs support -- cgit v1.2.3