1 |
commit: 5ef4bb8aca305f23370c2ec4eddaa1d59d7fd6ff |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 17 18:03:16 2022 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 17 18:03:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef4bb8a |
7 |
|
8 |
sys-cluster/ceph: add 16.2.8 |
9 |
|
10 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
11 |
|
12 |
sys-cluster/ceph/Manifest | 1 + |
13 |
sys-cluster/ceph/ceph-16.2.8.ebuild | 471 +++++++++++++++++++++ |
14 |
.../ceph/files/ceph-16.2.8-no-virtualenvs.patch | 82 ++++ |
15 |
3 files changed, 554 insertions(+) |
16 |
|
17 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
18 |
index 325977641159..67b64e166350 100644 |
19 |
--- a/sys-cluster/ceph/Manifest |
20 |
+++ b/sys-cluster/ceph/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b |
23 |
DIST ceph-16.2.7.tar.gz 156621262 BLAKE2B 3c79cb1586e71927df4578fe7f3a13f4ab257a5e145b6bf76d942292cbca7bf32583350373f3d816f6d8f8700ee0f98a14f350c823b0eb89ffd7735acee7de63 SHA512 eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c |
24 |
+DIST ceph-16.2.8.tar.gz 157167317 BLAKE2B 06958b165c0bf8aa467c11c55e4c42c8284525db532da0aac180b05491b9577501af14040bb7c2dc9544c657b8cc3ceaa49a1e00912d1fb43938fdca79aefcf8 SHA512 5ea3857d6ba401d3ac969d95eaed4ea9f43bba1dc25b1c84a9ca14420d790413b8eda953edd576341c79d937433adce0c268f2e8bde9137bbd69f4535b0cc740 |
25 |
DIST ceph-17.2.0.tar.gz 168742006 BLAKE2B 15272da3471722936198f62b5ef7537d29bd944b35ef1552e87cf0f0f400a8be5fd1fa873494eb17ca71df9360d7ffa4fa20a6f1b1ba819520b180770a4e6299 SHA512 70b96e709f153f16069bec8346ea73812d699eaab91a012351d02addb3fd176b84fce32c3dae84fdf91d0ffe49f2bb258410b47caeee81d81a672b4dbd04cc7e |
26 |
DIST ceph-xsimd-17.2.0.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33 |
27 |
|
28 |
diff --git a/sys-cluster/ceph/ceph-16.2.8.ebuild b/sys-cluster/ceph/ceph-16.2.8.ebuild |
29 |
new file mode 100644 |
30 |
index 000000000000..56debbe477af |
31 |
--- /dev/null |
32 |
+++ b/sys-cluster/ceph/ceph-16.2.8.ebuild |
33 |
@@ -0,0 +1,471 @@ |
34 |
+# Copyright 1999-2022 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=8 |
38 |
+ |
39 |
+PYTHON_COMPAT=( python3_{8..10} ) |
40 |
+LUA_COMPAT=( lua5-3 ) |
41 |
+ |
42 |
+CMAKE_MAKEFILE_GENERATOR=emake |
43 |
+ |
44 |
+inherit check-reqs bash-completion-r1 cmake python-r1 flag-o-matic \ |
45 |
+ lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles |
46 |
+ |
47 |
+SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" |
48 |
+KEYWORDS="~amd64 ~arm64 ~ppc64" |
49 |
+ |
50 |
+DESCRIPTION="Ceph distributed filesystem" |
51 |
+HOMEPAGE="https://ceph.com/" |
52 |
+ |
53 |
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain" |
54 |
+SLOT="0" |
55 |
+ |
56 |
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3) |
57 |
+ |
58 |
+IUSE=" |
59 |
+ babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana |
60 |
+ jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq |
61 |
+ +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost |
62 |
+ systemd +tcmalloc test uring xfs zbd zfs |
63 |
+" |
64 |
+ |
65 |
+IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
66 |
+ |
67 |
+DEPEND=" |
68 |
+ ${LUA_DEPS} |
69 |
+ ${PYTHON_DEPS} |
70 |
+ acct-group/ceph |
71 |
+ acct-user/ceph |
72 |
+ virtual/libudev:= |
73 |
+ app-arch/bzip2:= |
74 |
+ app-arch/lz4:= |
75 |
+ app-arch/snappy:= |
76 |
+ || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) |
77 |
+ app-arch/zstd:= |
78 |
+ app-shells/bash:0 |
79 |
+ app-misc/jq:= |
80 |
+ dev-libs/crypto++:= |
81 |
+ dev-cpp/gflags:= |
82 |
+ <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] |
83 |
+ dev-libs/libaio:= |
84 |
+ dev-libs/libfmt:= |
85 |
+ dev-libs/libnl:3= |
86 |
+ dev-libs/libxml2:= |
87 |
+ dev-libs/libevent:= |
88 |
+ dev-libs/openssl:= |
89 |
+ <dev-libs/rocksdb-6.15:= |
90 |
+ dev-libs/xmlsec:=[openssl] |
91 |
+ dev-cpp/yaml-cpp:= |
92 |
+ dev-libs/nss:= |
93 |
+ dev-libs/protobuf:= |
94 |
+ net-dns/c-ares:= |
95 |
+ net-libs/gnutls:= |
96 |
+ sys-auth/oath-toolkit:= |
97 |
+ sys-apps/coreutils |
98 |
+ sys-apps/hwloc:= |
99 |
+ sys-apps/keyutils:= |
100 |
+ sys-apps/util-linux:= |
101 |
+ sys-apps/util-linux |
102 |
+ sys-libs/libcap-ng:= |
103 |
+ sys-libs/ncurses:0= |
104 |
+ sys-libs/zlib:= |
105 |
+ sys-process/numactl:= |
106 |
+ virtual/libcrypt:= |
107 |
+ x11-libs/libpciaccess:= |
108 |
+ babeltrace? ( dev-util/babeltrace ) |
109 |
+ fuse? ( sys-fs/fuse:3= ) |
110 |
+ jemalloc? ( dev-libs/jemalloc:= ) |
111 |
+ !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) |
112 |
+ jaeger? ( dev-cpp/nlohmann_json:= ) |
113 |
+ kafka? ( dev-libs/librdkafka:= ) |
114 |
+ kerberos? ( virtual/krb5 ) |
115 |
+ ldap? ( net-nds/openldap:= ) |
116 |
+ lttng? ( dev-util/lttng-ust:= ) |
117 |
+ pmdk? ( dev-libs/pmdk:= ) |
118 |
+ rabbitmq? ( net-libs/rabbitmq-c:= ) |
119 |
+ radosgw? ( |
120 |
+ dev-libs/icu:= |
121 |
+ dev-libs/expat:= |
122 |
+ net-misc/curl:=[curl_ssl_openssl] |
123 |
+ ) |
124 |
+ rbd-rwl? ( dev-libs/pmdk:= ) |
125 |
+ rdma? ( sys-cluster/rdma-core:= ) |
126 |
+ spdk? ( dev-util/cunit ) |
127 |
+ sqlite? ( dev-db/sqlite:= ) |
128 |
+ system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] ) |
129 |
+ !system-boost? ( $(python_gen_impl_dep '' 3.8 3.9) ) |
130 |
+ uring? ( sys-libs/liburing:= ) |
131 |
+ xfs? ( sys-fs/xfsprogs:= ) |
132 |
+ zbd? ( sys-block/libzbd:= ) |
133 |
+ zfs? ( sys-fs/zfs:= ) |
134 |
+" |
135 |
+BDEPEND=" |
136 |
+ amd64? ( dev-lang/nasm ) |
137 |
+ x86? ( dev-lang/yasm ) |
138 |
+ app-arch/cpio |
139 |
+ >=dev-util/cmake-3.5.0 |
140 |
+ dev-python/cython[${PYTHON_USEDEP}] |
141 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
142 |
+ dev-python/sphinx |
143 |
+ dev-util/gperf |
144 |
+ dev-util/ragel |
145 |
+ dev-util/valgrind |
146 |
+ sys-apps/coreutils |
147 |
+ sys-apps/grep |
148 |
+ sys-apps/sed |
149 |
+ sys-apps/util-linux |
150 |
+ sys-apps/which |
151 |
+ sys-devel/bc |
152 |
+ sys-devel/patch |
153 |
+ virtual/pkgconfig |
154 |
+ jaeger? ( |
155 |
+ sys-devel/bison |
156 |
+ sys-devel/flex |
157 |
+ ) |
158 |
+ test? ( |
159 |
+ dev-util/cunit |
160 |
+ dev-python/coverage[${PYTHON_USEDEP}] |
161 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
162 |
+ dev-python/requests-mock[${PYTHON_USEDEP}] |
163 |
+ sys-apps/grep[pcre] |
164 |
+ sys-fs/btrfs-progs |
165 |
+ ) |
166 |
+" |
167 |
+RDEPEND=" |
168 |
+ ${DEPEND} |
169 |
+ app-admin/sudo |
170 |
+ net-misc/socat |
171 |
+ sys-apps/gptfdisk |
172 |
+ sys-apps/nvme-cli |
173 |
+ >=sys-apps/smartmontools-7.0 |
174 |
+ sys-block/parted |
175 |
+ sys-fs/cryptsetup |
176 |
+ sys-fs/lsscsi |
177 |
+ sys-fs/lvm2[-device-mapper-only(-)] |
178 |
+ virtual/awk |
179 |
+ dev-python/bcrypt[${PYTHON_USEDEP}] |
180 |
+ dev-python/cherrypy[${PYTHON_USEDEP}] |
181 |
+ dev-python/python-dateutil[${PYTHON_USEDEP}] |
182 |
+ dev-python/flask[${PYTHON_USEDEP}] |
183 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
184 |
+ dev-python/pecan[${PYTHON_USEDEP}] |
185 |
+ dev-python/prettytable[${PYTHON_USEDEP}] |
186 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
187 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
188 |
+ dev-python/requests[${PYTHON_USEDEP}] |
189 |
+ dev-python/werkzeug[${PYTHON_USEDEP}] |
190 |
+ mgr? ( |
191 |
+ dev-python/jsonpatch[${PYTHON_USEDEP}] |
192 |
+ dev-python/more-itertools[${PYTHON_USEDEP}] |
193 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
194 |
+ dev-python/pyjwt[${PYTHON_USEDEP}] |
195 |
+ dev-python/routes[${PYTHON_USEDEP}] |
196 |
+ diskprediction? ( |
197 |
+ >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] |
198 |
+ ) |
199 |
+ sci-libs/scikit-learn[${PYTHON_USEDEP}] |
200 |
+ dev-python/six[${PYTHON_USEDEP}] |
201 |
+ ) |
202 |
+" |
203 |
+# diskprediction needs older scipy not compatible with py38 |
204 |
+# bug #724438 |
205 |
+REQUIRED_USE=" |
206 |
+ ${PYTHON_REQUIRED_USE} |
207 |
+ ${LUA_REQUIRED_USE} |
208 |
+ ?? ( jemalloc tcmalloc ) |
209 |
+ jaeger? ( !system-boost ) |
210 |
+ diskprediction? ( mgr ) |
211 |
+ kafka? ( radosgw ) |
212 |
+ mgr? ( cephfs ) |
213 |
+ rabbitmq? ( radosgw ) |
214 |
+ !system-boost? ( |
215 |
+ || ( |
216 |
+ python_targets_python3_8 |
217 |
+ python_targets_python3_9 |
218 |
+ ) |
219 |
+ ) |
220 |
+" |
221 |
+ |
222 |
+RESTRICT=" |
223 |
+ !test? ( test ) |
224 |
+" |
225 |
+ |
226 |
+# tests need root access, and network access |
227 |
+RESTRICT+="test" |
228 |
+ |
229 |
+# create a non-debug release |
230 |
+CMAKE_BUILD_TYPE=RelWithDebInfo |
231 |
+ |
232 |
+# false positives unless all USE flags are on |
233 |
+CMAKE_WARN_UNUSED_CLI=no |
234 |
+ |
235 |
+PATCHES=( |
236 |
+ "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
237 |
+ "${FILESDIR}/ceph-14.2.0-cflags.patch" |
238 |
+ "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" |
239 |
+ "${FILESDIR}/ceph-16.2.2-cflags.patch" |
240 |
+ "${FILESDIR}/ceph-16.2.8-no-virtualenvs.patch" |
241 |
+ "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
242 |
+ "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" |
243 |
+ "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" |
244 |
+ "${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch" |
245 |
+ "${FILESDIR}/ceph-15.2.3-spdk-compile.patch" |
246 |
+ "${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch" |
247 |
+ "${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch" |
248 |
+ "${FILESDIR}/ceph-16.2.0-liburing.patch" |
249 |
+ "${FILESDIR}/ceph-16.2.2-system-zstd.patch" |
250 |
+ "${FILESDIR}/ceph-16.2.7-string-includes.patch" |
251 |
+ "${FILESDIR}/ceph-17.2.0-fuse3.patch" |
252 |
+) |
253 |
+ |
254 |
+check-reqs_export_vars() { |
255 |
+ CHECKREQS_DISK_BUILD="6G" |
256 |
+ |
257 |
+ if use system-boost; then |
258 |
+ CHECKREQS_DISK_USR="350M" |
259 |
+ else |
260 |
+ CHECKREQS_DISK_USR="510M" |
261 |
+ fi |
262 |
+ |
263 |
+ export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR |
264 |
+} |
265 |
+ |
266 |
+pkg_pretend() { |
267 |
+ check-reqs_export_vars |
268 |
+ check-reqs_pkg_pretend |
269 |
+} |
270 |
+ |
271 |
+pkg_setup() { |
272 |
+ if ! use system-boost; then |
273 |
+ python_setup 3.8 3.9 |
274 |
+ else |
275 |
+ python_setup |
276 |
+ fi |
277 |
+ lua_setup |
278 |
+ check-reqs_export_vars |
279 |
+ check-reqs_pkg_setup |
280 |
+} |
281 |
+ |
282 |
+src_prepare() { |
283 |
+ cmake_src_prepare |
284 |
+ |
285 |
+ if use system-boost; then |
286 |
+ find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ |
287 |
+ | xargs --null sed -r \ |
288 |
+ -e 's|Boost::|boost_|g' \ |
289 |
+ -e 's|Boost_|boost_|g' \ |
290 |
+ -e 's|[Bb]oost_boost|boost_system|g' \ |
291 |
+ -i || die |
292 |
+ fi |
293 |
+ |
294 |
+ if ! use systemd; then |
295 |
+ find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \ |
296 |
+ | xargs --null sed \ |
297 |
+ -e '/^from ceph_volume.systemd import systemctl/ d' \ |
298 |
+ -i || die |
299 |
+ fi |
300 |
+ |
301 |
+ sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ |
302 |
+ -i src/bash_completion/CMakeLists.txt || die |
303 |
+ |
304 |
+ sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die |
305 |
+ |
306 |
+ if ! use diskprediction; then |
307 |
+ rm -rf src/pybind/mgr/diskprediction_local || die |
308 |
+ fi |
309 |
+ |
310 |
+ # force lua version to use selected version |
311 |
+ local lua_version |
312 |
+ lua_version=$(ver_cut 1-2 $(lua_get_version)) |
313 |
+ sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \ |
314 |
+ -i src/CMakeLists.txt |
315 |
+ |
316 |
+ # remove tests that need root access |
317 |
+ rm src/test/cli/ceph-authtool/cap*.t || die |
318 |
+} |
319 |
+ |
320 |
+ceph_src_configure() { |
321 |
+ local mycmakeargs=( |
322 |
+ -DWITH_BABELTRACE:BOOL=$(usex babeltrace) |
323 |
+ -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) |
324 |
+ -DWITH_CEPHFS:BOOL=$(usex cephfs) |
325 |
+ -DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs) |
326 |
+ -DWITH_DPDK:BOOL=$(usex dpdk) |
327 |
+ -DWITH_SPDK:BOOL=$(usex spdk) |
328 |
+ -DWITH_FUSE:BOOL=$(usex fuse) |
329 |
+ -DWITH_LTTNG:BOOL=$(usex lttng) |
330 |
+ -DWITH_GSSAPI:BOOL=$(usex kerberos) |
331 |
+ -DWITH_GRAFANA:BOOL=$(usex grafana) |
332 |
+ -DWITH_MGR:BOOL=$(usex mgr) |
333 |
+ -DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF |
334 |
+ -DWITH_OPENLDAP:BOOL=$(usex ldap) |
335 |
+ -DWITH_PYTHON3:STRING=3 |
336 |
+ -DWITH_RADOSGW:BOOL=$(usex radosgw) |
337 |
+ -DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq) |
338 |
+ -DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka) |
339 |
+ -DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO") |
340 |
+ -DWITH_RBD_RWL:BOOL=$(usex rbd-rwl) |
341 |
+ -DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd) |
342 |
+ -DWITH_SYSTEMD:BOOL=$(usex systemd) |
343 |
+ -DWITH_TESTS:BOOL=$(usex test) |
344 |
+ -DWITH_LIBURING:BOOL=$(usex uring) |
345 |
+ -DWITH_SYSTEM_LIBURING:BOOL=$(usex uring) |
346 |
+ -DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite) |
347 |
+ -DWITH_XFS:BOOL=$(usex xfs) |
348 |
+ -DWITH_ZBD:BOOL=$(usex zbd) |
349 |
+ -DWITH_ZFS:BOOL=$(usex zfs) |
350 |
+ -DENABLE_SHARED:BOOL=ON |
351 |
+ -DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") |
352 |
+ -DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl)") |
353 |
+ -DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost) |
354 |
+ -DWITH_SYSTEM_ROCKSDB:BOOL=ON |
355 |
+ -DWITH_RDMA:BOOL=$(usex rdma) |
356 |
+ -DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
357 |
+ -DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc" |
358 |
+ -Wno-dev |
359 |
+ ) |
360 |
+ |
361 |
+ # this breaks when re-configuring for python impl |
362 |
+ if [[ ${EBUILD_PHASE} == configure ]]; then |
363 |
+ mycmakeargs+=( |
364 |
+ -DWITH_JAEGER:BOOL=$(usex jaeger) |
365 |
+ ) |
366 |
+ else |
367 |
+ mycmakeargs+=( |
368 |
+ -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF |
369 |
+ ) |
370 |
+ fi |
371 |
+ |
372 |
+ # conditionally used cmake args |
373 |
+ use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) ) |
374 |
+ use systemd && mycmakeargs+=( -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=$(systemd_get_systemunitdir) ) |
375 |
+ |
376 |
+ if use amd64 || use x86; then |
377 |
+ local flag |
378 |
+ for flag in "${CPU_FLAGS_X86[@]}"; do |
379 |
+ case "${flag}" in |
380 |
+ avx*) |
381 |
+ local var=${flag%f} |
382 |
+ mycmakeargs+=( |
383 |
+ "-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})" |
384 |
+ ) |
385 |
+ ;; |
386 |
+ *) mycmakeargs+=( |
387 |
+ "-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})" |
388 |
+ );; |
389 |
+ esac |
390 |
+ done |
391 |
+ fi |
392 |
+ |
393 |
+ # needed for >=glibc-2.32 |
394 |
+ has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON ) |
395 |
+ |
396 |
+ rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ |
397 |
+ || die "failed to remove cmake cache" |
398 |
+ |
399 |
+ cmake_src_configure |
400 |
+ |
401 |
+ # bug #630232 |
402 |
+ sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
403 |
+ "${BUILD_DIR:-${S}}"/include/acconfig.h \ |
404 |
+ || die "sed failed" |
405 |
+} |
406 |
+ |
407 |
+src_configure() { |
408 |
+ use custom-cflags || strip-flags |
409 |
+ ceph_src_configure |
410 |
+} |
411 |
+ |
412 |
+src_compile() { |
413 |
+ cmake_build VERBOSE=1 all |
414 |
+ |
415 |
+ # we have to do this here to prevent from building everything multiple times |
416 |
+ python_copy_sources |
417 |
+ python_foreach_impl python_compile |
418 |
+} |
419 |
+ |
420 |
+python_compile() { |
421 |
+ local CMAKE_USE_DIR="${S}" |
422 |
+ ceph_src_configure |
423 |
+ |
424 |
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
425 |
+ cmake_build VERBOSE=1 clean |
426 |
+ cmake_build VERBOSE=1 all |
427 |
+ |
428 |
+ # python modules are only compiled with "make install" so we need to do this to |
429 |
+ # prevent doing a bunch of compilation in src_install |
430 |
+ DESTDIR="${T}" cmake_build VERBOSE=1 install |
431 |
+ popd >/dev/null || die |
432 |
+} |
433 |
+ |
434 |
+src_install() { |
435 |
+ python_foreach_impl python_install |
436 |
+ |
437 |
+ python_setup |
438 |
+ cmake_src_install |
439 |
+ |
440 |
+ find "${ED}" -name '*.la' -type f -delete || die |
441 |
+ |
442 |
+ exeinto /usr/$(get_libdir)/ceph |
443 |
+ newexe "${BUILD_DIR}/bin/init-ceph" init-ceph |
444 |
+ |
445 |
+ insinto /etc/logrotate.d/ |
446 |
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
447 |
+ |
448 |
+ keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
449 |
+ |
450 |
+ fowners -R ceph:ceph /var/log/ceph |
451 |
+ |
452 |
+ newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap |
453 |
+ newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} |
454 |
+ newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
455 |
+ |
456 |
+ insinto /etc/sudoers.d |
457 |
+ doins sudoers.d/* |
458 |
+ |
459 |
+ insinto /etc/sysctl.d |
460 |
+ newins "${FILESDIR}"/sysctld 90-${PN}.conf |
461 |
+ |
462 |
+ use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc |
463 |
+ |
464 |
+ # units aren't installed by the build system unless systemd is enabled |
465 |
+ # so no point installing these with the USE flag disabled |
466 |
+ if use systemd; then |
467 |
+ systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service" |
468 |
+ systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service" |
469 |
+ fi |
470 |
+ |
471 |
+ udev_dorules udev/*.rules |
472 |
+ newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf |
473 |
+ |
474 |
+ readme.gentoo_create_doc |
475 |
+ |
476 |
+ # bug #630232 |
477 |
+ sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ |
478 |
+ || die "sed failed" |
479 |
+ |
480 |
+ python_fix_shebang "${ED}"/usr/{,s}bin/ |
481 |
+ |
482 |
+ # python_fix_shebang apparently is not idempotent |
483 |
+ local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' |
484 |
+ grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ |
485 |
+ | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die |
486 |
+ |
487 |
+ local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) |
488 |
+ dostrip -x "${rados_classes[@]#${ED}}" |
489 |
+} |
490 |
+ |
491 |
+python_install() { |
492 |
+ local CMAKE_USE_DIR="${S}" |
493 |
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
494 |
+ DESTDIR="${ED}" cmake_build VERBOSE=1 install |
495 |
+ popd >/dev/null || die |
496 |
+ |
497 |
+ python_optimize |
498 |
+} |
499 |
+ |
500 |
+pkg_postinst() { |
501 |
+ readme.gentoo_print_elog |
502 |
+ tmpfiles_process ${PN}.conf |
503 |
+ udev_reload |
504 |
+} |
505 |
|
506 |
diff --git a/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch |
507 |
new file mode 100644 |
508 |
index 000000000000..79aee882c2a4 |
509 |
--- /dev/null |
510 |
+++ b/sys-cluster/ceph/files/ceph-16.2.8-no-virtualenvs.patch |
511 |
@@ -0,0 +1,82 @@ |
512 |
+diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake |
513 |
+index cd661be16c9..7183c2f2138 100644 |
514 |
+--- a/cmake/modules/AddCephTest.cmake |
515 |
++++ b/cmake/modules/AddCephTest.cmake |
516 |
+@@ -55,7 +55,6 @@ endfunction() |
517 |
+ |
518 |
+ function(add_tox_test name) |
519 |
+ set(test_name run-tox-${name}) |
520 |
+- set(venv_path ${CEPH_BUILD_VIRTUALENV}/${name}-virtualenv) |
521 |
+ cmake_parse_arguments(TOXTEST "" "TOX_PATH" "TOX_ENVS" ${ARGN}) |
522 |
+ if(DEFINED TOXTEST_TOX_PATH) |
523 |
+ set(tox_path ${TOXTEST_TOX_PATH}) |
524 |
+@@ -68,14 +67,6 @@ function(add_tox_test name) |
525 |
+ list(APPEND tox_envs py3) |
526 |
+ endif() |
527 |
+ string(REPLACE ";" "," tox_envs "${tox_envs}") |
528 |
+- add_custom_command( |
529 |
+- OUTPUT ${venv_path}/bin/activate |
530 |
+- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path} |
531 |
+- WORKING_DIRECTORY ${tox_path} |
532 |
+- COMMENT "preparing venv for ${name}") |
533 |
+- add_custom_target(${name}-venv |
534 |
+- DEPENDS ${venv_path}/bin/activate) |
535 |
+- add_dependencies(tests ${name}-venv) |
536 |
+ add_test( |
537 |
+ NAME ${test_name} |
538 |
+ COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh |
539 |
+diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt |
540 |
+index 9166553dc73..9a6c87595b9 100644 |
541 |
+--- a/src/ceph-volume/CMakeLists.txt |
542 |
++++ b/src/ceph-volume/CMakeLists.txt |
543 |
+@@ -8,22 +8,6 @@ if(FREEBSD) |
544 |
+ add_subdirectory(plugin/zfs) |
545 |
+ endif() |
546 |
+ |
547 |
+-# Required for running ceph-volume inventory in a vstart environment |
548 |
+-set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv) |
549 |
+- |
550 |
+-add_custom_command( |
551 |
+- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python |
552 |
+- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python3_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV} |
553 |
+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume |
554 |
+- COMMENT "ceph-volume venv is being created") |
555 |
+- |
556 |
+-add_custom_command( |
557 |
+- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume |
558 |
+- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python |
559 |
+- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate |
560 |
+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume |
561 |
+- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume") |
562 |
+- |
563 |
+ add_custom_target(ceph-volume-venv-setup |
564 |
+ DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume) |
565 |
+ |
566 |
+diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt |
567 |
+index 0c8d46d65ee..67a618f95aa 100644 |
568 |
+--- a/src/pybind/mgr/dashboard/CMakeLists.txt |
569 |
++++ b/src/pybind/mgr/dashboard/CMakeLists.txt |
570 |
+@@ -5,9 +5,6 @@ function(add_npm_command) |
571 |
+ set(multi_kw COMMAND DEPENDS) |
572 |
+ cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) |
573 |
+ string(REPLACE ";" " " command "${NC_COMMAND}") |
574 |
+- if(NC_NODEENV) |
575 |
+- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) |
576 |
+- endif() |
577 |
+ string(REPLACE " " ";" command "${command}") |
578 |
+ add_custom_command( |
579 |
+ OUTPUT "${NC_OUTPUT}" |
580 |
+@@ -51,11 +48,8 @@ else(WITH_SYSTEM_NPM) |
581 |
+ set(node_mirror_opt "--mirror=$ENV{NODE_MIRROR}") |
582 |
+ endif() |
583 |
+ add_custom_command( |
584 |
+- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" |
585 |
+- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} |
586 |
+- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv |
587 |
+- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=12.18.2 |
588 |
+- COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm |
589 |
++ OUTPUT "/bin/npm" |
590 |
++ COMMAND /bin/nodeenv ${node_mirror_opt} -p --node=12.18.2 |
591 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
592 |
+ COMMENT "dashboard nodeenv is being installed" |
593 |
+ ) |