1 |
commit: 8e91fc08406dde5075852d4c9fdc9a7a8263070f |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 27 04:33:22 2021 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 27 05:30:06 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e91fc08 |
7 |
|
8 |
sys-cluster/ceph-15.2.13: Version bump |
9 |
|
10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
11 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
12 |
|
13 |
sys-cluster/ceph/Manifest | 1 + |
14 |
sys-cluster/ceph/ceph-15.2.13.ebuild | 403 +++++++++++++++++++++ |
15 |
.../ceph/files/ceph-15.2.13-no-virtualenvs.patch | 73 ++++ |
16 |
3 files changed, 477 insertions(+) |
17 |
|
18 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
19 |
index 1fc50693970..6c86ea70178 100644 |
20 |
--- a/sys-cluster/ceph/Manifest |
21 |
+++ b/sys-cluster/ceph/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST ceph-14.2.21.tar.gz 129272778 BLAKE2B f82f452e0f0c40a95ea1bdb3654c2d322caa3edeeb05e41247e02a8ffe731c570d9e49aefa61c447a8b73620d4a9b9872335171f1e08fbd9a08eea930ccbfe76 SHA512 39b4a0624dcab2bafa50f51a42155fcf96dad74531a001d75009ad246a8ca80ce81ae538b34c0a1b773691c363626f1d0342f2439b711bd0dd16214592171884 |
24 |
DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5 SHA512 08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f |
25 |
+DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d SHA512 bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da |
26 |
DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6 |
27 |
|
28 |
diff --git a/sys-cluster/ceph/ceph-15.2.13.ebuild b/sys-cluster/ceph/ceph-15.2.13.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..6eee7a8e23e |
31 |
--- /dev/null |
32 |
+++ b/sys-cluster/ceph/ceph-15.2.13.ebuild |
33 |
@@ -0,0 +1,403 @@ |
34 |
+# Copyright 1999-2021 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+PYTHON_COMPAT=( python3_{7..9} ) |
39 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
40 |
+CMAKE_MAKEFILE_GENERATOR=emake |
41 |
+ |
42 |
+DISTUTILS_OPTIONAL=1 |
43 |
+ |
44 |
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ |
45 |
+ python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles |
46 |
+ |
47 |
+if [[ ${PV} == *9999* ]]; then |
48 |
+ inherit git-r3 |
49 |
+ EGIT_REPO_URI="https://github.com/ceph/ceph.git" |
50 |
+ SRC_URI="" |
51 |
+else |
52 |
+ SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" |
53 |
+ KEYWORDS="~amd64 ~arm64 ~ppc64" |
54 |
+fi |
55 |
+ |
56 |
+DESCRIPTION="Ceph distributed filesystem" |
57 |
+HOMEPAGE="https://ceph.com/" |
58 |
+ |
59 |
+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" |
60 |
+SLOT="0" |
61 |
+ |
62 |
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) |
63 |
+ |
64 |
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc |
65 |
+ kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk |
66 |
+ system-boost systemd +tcmalloc test uring xfs zfs" |
67 |
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
68 |
+ |
69 |
+DEPEND=" |
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/zstd:= |
77 |
+ app-shells/bash:0 |
78 |
+ app-misc/jq:= |
79 |
+ dev-libs/crypto++:= |
80 |
+ dev-cpp/gflags:= |
81 |
+ dev-libs/leveldb:=[snappy,tcmalloc(-)?] |
82 |
+ dev-libs/libaio:= |
83 |
+ dev-libs/libfmt:= |
84 |
+ dev-libs/libnl:3= |
85 |
+ dev-libs/libxml2:= |
86 |
+ <dev-libs/rocksdb-6.15:= |
87 |
+ dev-libs/xmlsec:=[openssl] |
88 |
+ dev-cpp/yaml-cpp:= |
89 |
+ dev-libs/nss:= |
90 |
+ dev-libs/protobuf:= |
91 |
+ net-dns/c-ares:= |
92 |
+ net-libs/gnutls:= |
93 |
+ sys-auth/oath-toolkit:= |
94 |
+ sys-apps/coreutils |
95 |
+ sys-apps/grep |
96 |
+ sys-apps/hwloc:= |
97 |
+ sys-apps/keyutils:= |
98 |
+ sys-apps/util-linux:= |
99 |
+ sys-apps/sed |
100 |
+ sys-apps/util-linux |
101 |
+ sys-libs/libcap-ng:= |
102 |
+ sys-libs/ncurses:0= |
103 |
+ sys-libs/zlib:= |
104 |
+ sys-process/numactl:= |
105 |
+ x11-libs/libpciaccess:= |
106 |
+ babeltrace? ( dev-util/babeltrace ) |
107 |
+ fuse? ( sys-fs/fuse:0= ) |
108 |
+ jemalloc? ( dev-libs/jemalloc:= ) |
109 |
+ !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) |
110 |
+ kafka? ( dev-libs/librdkafka:= ) |
111 |
+ kerberos? ( virtual/krb5 ) |
112 |
+ ldap? ( net-nds/openldap:= ) |
113 |
+ lttng? ( dev-util/lttng-ust:= ) |
114 |
+ pmdk? ( dev-libs/pmdk:= ) |
115 |
+ rabbitmq? ( net-libs/rabbitmq-c:= ) |
116 |
+ radosgw? ( |
117 |
+ dev-libs/expat:= |
118 |
+ dev-libs/openssl:= |
119 |
+ net-misc/curl:=[curl_ssl_openssl] |
120 |
+ ) |
121 |
+ rbd-rwl? ( dev-libs/pmdk:= ) |
122 |
+ ssl? ( dev-libs/openssl:= ) |
123 |
+ system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] ) |
124 |
+ uring? ( sys-libs/liburing:= ) |
125 |
+ xfs? ( sys-fs/xfsprogs:= ) |
126 |
+ zfs? ( sys-fs/zfs:= ) |
127 |
+ ${PYTHON_DEPS} |
128 |
+" |
129 |
+BDEPEND=" |
130 |
+ amd64? ( dev-lang/yasm ) |
131 |
+ x86? ( dev-lang/yasm ) |
132 |
+ app-arch/cpio |
133 |
+ >=dev-util/cmake-3.5.0 |
134 |
+ dev-python/cython[${PYTHON_USEDEP}] |
135 |
+ dev-python/sphinx |
136 |
+ dev-util/cunit |
137 |
+ dev-util/gperf |
138 |
+ dev-util/ragel |
139 |
+ dev-util/valgrind |
140 |
+ sys-apps/coreutils |
141 |
+ sys-apps/findutils |
142 |
+ sys-apps/grep |
143 |
+ sys-apps/sed |
144 |
+ sys-apps/which |
145 |
+ sys-devel/bc |
146 |
+ sys-devel/patch |
147 |
+ virtual/pkgconfig |
148 |
+ test? ( |
149 |
+ dev-python/coverage[${PYTHON_USEDEP}] |
150 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
151 |
+ dev-python/requests-mock[${PYTHON_USEDEP}] |
152 |
+ sys-apps/grep[pcre] |
153 |
+ sys-fs/btrfs-progs |
154 |
+ ) |
155 |
+" |
156 |
+RDEPEND="${DEPEND} |
157 |
+ app-admin/sudo |
158 |
+ net-misc/socat |
159 |
+ sys-apps/gptfdisk |
160 |
+ sys-apps/nvme-cli |
161 |
+ >=sys-apps/smartmontools-7.0 |
162 |
+ sys-block/parted |
163 |
+ sys-fs/cryptsetup |
164 |
+ sys-fs/lsscsi |
165 |
+ sys-fs/lvm2[-device-mapper-only(-)] |
166 |
+ virtual/awk |
167 |
+ dev-python/bcrypt[${PYTHON_USEDEP}] |
168 |
+ dev-python/cherrypy[${PYTHON_USEDEP}] |
169 |
+ dev-python/python-dateutil[${PYTHON_USEDEP}] |
170 |
+ dev-python/flask[${PYTHON_USEDEP}] |
171 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
172 |
+ dev-python/pecan[${PYTHON_USEDEP}] |
173 |
+ dev-python/prettytable[${PYTHON_USEDEP}] |
174 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
175 |
+ dev-python/requests[${PYTHON_USEDEP}] |
176 |
+ dev-python/werkzeug[${PYTHON_USEDEP}] |
177 |
+ mgr? ( |
178 |
+ dev-python/jsonpatch[${PYTHON_USEDEP}] |
179 |
+ dev-python/more-itertools[${PYTHON_USEDEP}] |
180 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
181 |
+ dev-python/pyjwt[${PYTHON_USEDEP}] |
182 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
183 |
+ dev-python/routes[${PYTHON_USEDEP}] |
184 |
+ diskprediction? ( |
185 |
+ $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) |
186 |
+ ) |
187 |
+ sci-libs/scikit-learn[${PYTHON_USEDEP}] |
188 |
+ dev-python/six[${PYTHON_USEDEP}] |
189 |
+ ) |
190 |
+" |
191 |
+# diskprediction needs older scipy not compatible with py38 |
192 |
+# bug #724438 |
193 |
+REQUIRED_USE=" |
194 |
+ ${PYTHON_REQUIRED_USE} |
195 |
+ ?? ( jemalloc tcmalloc ) |
196 |
+ diskprediction? ( mgr !python_targets_python3_8 ) |
197 |
+ kafka? ( radosgw ) |
198 |
+ mgr? ( cephfs ) |
199 |
+ rabbitmq? ( radosgw ) |
200 |
+" |
201 |
+RESTRICT="!test? ( test )" |
202 |
+ |
203 |
+# the tests need root access |
204 |
+RESTRICT="test? ( userpriv )" |
205 |
+ |
206 |
+# distribution tarball does not include everything needed for tests |
207 |
+RESTRICT+=" test" |
208 |
+ |
209 |
+# create a non-debug release |
210 |
+CMAKE_BUILD_TYPE=RelWithDebInfo |
211 |
+ |
212 |
+# false positives unless all USE flags are on |
213 |
+CMAKE_WARN_UNUSED_CLI=no |
214 |
+ |
215 |
+PATCHES=( |
216 |
+ "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
217 |
+ "${FILESDIR}/ceph-14.2.0-cflags.patch" |
218 |
+ "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" |
219 |
+ "${FILESDIR}/ceph-13.2.0-cflags.patch" |
220 |
+ "${FILESDIR}/ceph-15.2.13-no-virtualenvs.patch" |
221 |
+ "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
222 |
+ "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" |
223 |
+ "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" |
224 |
+ "${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch" |
225 |
+ "${FILESDIR}/ceph-15.2.2-systemd-unit.patch" |
226 |
+ "${FILESDIR}/ceph-15.2.3-spdk-compile.patch" |
227 |
+ "${FILESDIR}/ceph-15.2.4-system-uring.patch" |
228 |
+ "${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch" |
229 |
+) |
230 |
+ |
231 |
+check-reqs_export_vars() { |
232 |
+ CHECKREQS_DISK_BUILD="5400M" |
233 |
+ CHECKREQS_DISK_USR="510M" |
234 |
+ |
235 |
+ export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR |
236 |
+} |
237 |
+ |
238 |
+pkg_pretend() { |
239 |
+ check-reqs_export_vars |
240 |
+ check-reqs_pkg_pretend |
241 |
+} |
242 |
+ |
243 |
+pkg_setup() { |
244 |
+ python_setup |
245 |
+ check-reqs_export_vars |
246 |
+ check-reqs_pkg_setup |
247 |
+} |
248 |
+ |
249 |
+src_prepare() { |
250 |
+ cmake_src_prepare |
251 |
+ |
252 |
+ if use system-boost; then |
253 |
+ find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ |
254 |
+ | xargs --null sed -r \ |
255 |
+ -e 's|Boost::|boost_|g' \ |
256 |
+ -e 's|Boost_|boost_|g' \ |
257 |
+ -e 's|[Bb]oost_boost|boost_system|g' -i || die |
258 |
+ fi |
259 |
+ |
260 |
+ sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ |
261 |
+ -i src/bash_completion/CMakeLists.txt || die |
262 |
+ |
263 |
+ sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die |
264 |
+ |
265 |
+ if ! use diskprediction; then |
266 |
+ rm -rf src/pybind/mgr/diskprediction_local || die |
267 |
+ fi |
268 |
+ |
269 |
+ # remove tests that need root access |
270 |
+ rm src/test/cli/ceph-authtool/cap*.t || die |
271 |
+} |
272 |
+ |
273 |
+ceph_src_configure() { |
274 |
+ local flag |
275 |
+ local mycmakeargs=( |
276 |
+ -DWITH_BABELTRACE=$(usex babeltrace) |
277 |
+ -DWITH_BLUESTORE_PMEM=$(usex pmdk) |
278 |
+ -DWITH_CEPHFS=$(usex cephfs) |
279 |
+ -DWITH_CEPHFS_SHELL=$(usex cephfs) |
280 |
+ -DWITH_DPDK=$(usex dpdk) |
281 |
+ -DWITH_SPDK=$(usex spdk) |
282 |
+ -DWITH_FUSE=$(usex fuse) |
283 |
+ -DWITH_LTTNG=$(usex lttng) |
284 |
+ -DWITH_GSSAPI=$(usex kerberos) |
285 |
+ -DWITH_GRAFANA=$(usex grafana) |
286 |
+ -DWITH_MGR=$(usex mgr) |
287 |
+ -DWITH_MGR_DASHBOARD_FRONTEND=OFF |
288 |
+ -DWITH_NUMA=$(usex numa) |
289 |
+ -DWITH_OPENLDAP=$(usex ldap) |
290 |
+ -DWITH_PYTHON3=3 |
291 |
+ -DWITH_RADOSGW=$(usex radosgw) |
292 |
+ -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) |
293 |
+ -DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka) |
294 |
+ -DWITH_RBD_RWL=$(usex rbd-rwl) |
295 |
+ -DWITH_SSL=$(usex ssl) |
296 |
+ -DWITH_SYSTEMD=$(usex systemd) |
297 |
+ -DWITH_TESTS=$(usex test) |
298 |
+ -DWITH_LIBURING=$(usex uring) |
299 |
+ -DWITH_XFS=$(usex xfs) |
300 |
+ -DWITH_ZFS=$(usex zfs) |
301 |
+ -DENABLE_SHARED="ON" |
302 |
+ -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") |
303 |
+ -DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)") |
304 |
+ -DWITH_SYSTEM_BOOST=$(usex system-boost) |
305 |
+ -DBOOST_J=$(makeopts_jobs) |
306 |
+ -DWITH_SYSTEM_ROCKSDB=ON |
307 |
+ -DWITH_RDMA=OFF |
308 |
+ -DWITH_TBB=OFF |
309 |
+ -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) |
310 |
+ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir) |
311 |
+ -DEPYTHON_VERSION="${EPYTHON#python}" |
312 |
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
313 |
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" |
314 |
+ -Wno-dev |
315 |
+ ) |
316 |
+ if use amd64 || use x86; then |
317 |
+ for flag in ${CPU_FLAGS_X86[@]}; do |
318 |
+ mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") |
319 |
+ done |
320 |
+ fi |
321 |
+ |
322 |
+ # needed for >=glibc-2.32 |
323 |
+ has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON) |
324 |
+ |
325 |
+ rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ |
326 |
+ || die "failed to remove cmake cache" |
327 |
+ |
328 |
+ cmake_src_configure |
329 |
+ |
330 |
+ # bug #630232 |
331 |
+ sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
332 |
+ "${BUILD_DIR:-${S}}"/include/acconfig.h \ |
333 |
+ || die "sed failed" |
334 |
+} |
335 |
+ |
336 |
+src_configure() { |
337 |
+ use custom-cflags || strip-flags |
338 |
+ ceph_src_configure |
339 |
+} |
340 |
+ |
341 |
+python_compile() { |
342 |
+ local CMAKE_USE_DIR="${S}" |
343 |
+ ceph_src_configure |
344 |
+ |
345 |
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
346 |
+ emake VERBOSE=1 clean |
347 |
+ emake VERBOSE=1 all |
348 |
+ |
349 |
+ # python modules are only compiled with "make install" so we need to do this to |
350 |
+ # prevent doing a bunch of compilation in src_install |
351 |
+ DESTDIR="${T}" emake VERBOSE=1 install |
352 |
+ popd >/dev/null || die |
353 |
+} |
354 |
+ |
355 |
+src_compile() { |
356 |
+ cmake_build VERBOSE=1 all |
357 |
+ |
358 |
+ # we have to do this here to prevent from building everything multiple times |
359 |
+ python_copy_sources |
360 |
+ python_foreach_impl python_compile |
361 |
+} |
362 |
+ |
363 |
+src_test() { |
364 |
+ make check || die "make check failed" |
365 |
+} |
366 |
+ |
367 |
+python_install() { |
368 |
+ local CMAKE_USE_DIR="${S}" |
369 |
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
370 |
+ DESTDIR="${ED}" emake VERBOSE=1 install |
371 |
+ popd >/dev/null || die |
372 |
+ |
373 |
+ python_optimize |
374 |
+} |
375 |
+ |
376 |
+src_install() { |
377 |
+ cmake_src_install |
378 |
+ python_foreach_impl python_install |
379 |
+ |
380 |
+ find "${ED}" -name '*.la' -type f -delete || die |
381 |
+ |
382 |
+ exeinto /usr/$(get_libdir)/ceph |
383 |
+ newexe "${BUILD_DIR}/bin/init-ceph" init-ceph |
384 |
+ |
385 |
+ insinto /etc/logrotate.d/ |
386 |
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
387 |
+ |
388 |
+ keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
389 |
+ |
390 |
+ fowners -R ceph:ceph /var/log/ceph |
391 |
+ |
392 |
+ newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap |
393 |
+ newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} |
394 |
+ newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
395 |
+ |
396 |
+ insinto /etc/sysctl.d |
397 |
+ newins "${FILESDIR}"/sysctld 90-${PN}.conf |
398 |
+ |
399 |
+ use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc |
400 |
+ |
401 |
+ # units aren't installed by the build system unless systemd is enabled |
402 |
+ # so no point installing these with the USE flag disabled |
403 |
+ if use systemd; then |
404 |
+ systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ |
405 |
+ "ceph-mds@.service" |
406 |
+ |
407 |
+ systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ |
408 |
+ "ceph-osd@.service" |
409 |
+ |
410 |
+ fi |
411 |
+ |
412 |
+ udev_dorules udev/*.rules |
413 |
+ newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf |
414 |
+ |
415 |
+ readme.gentoo_create_doc |
416 |
+ |
417 |
+ python_setup |
418 |
+ |
419 |
+ # bug #630232 |
420 |
+ sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ |
421 |
+ || die "sed failed" |
422 |
+ |
423 |
+ python_fix_shebang "${ED}"/usr/{,s}bin/ |
424 |
+ |
425 |
+ # python_fix_shebang apparently is not idempotent |
426 |
+ local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' |
427 |
+ grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ |
428 |
+ | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die |
429 |
+ |
430 |
+ local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) |
431 |
+ dostrip -x "${rados_classes[@]#${ED}}" |
432 |
+} |
433 |
+ |
434 |
+pkg_postinst() { |
435 |
+ readme.gentoo_print_elog |
436 |
+} |
437 |
|
438 |
diff --git a/sys-cluster/ceph/files/ceph-15.2.13-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-15.2.13-no-virtualenvs.patch |
439 |
new file mode 100644 |
440 |
index 00000000000..665bb891426 |
441 |
--- /dev/null |
442 |
+++ b/sys-cluster/ceph/files/ceph-15.2.13-no-virtualenvs.patch |
443 |
@@ -0,0 +1,73 @@ |
444 |
+diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake |
445 |
+index c9ee8c1b8f..09f75543da 100644 |
446 |
+--- a/cmake/modules/AddCephTest.cmake |
447 |
++++ b/cmake/modules/AddCephTest.cmake |
448 |
+@@ -68,14 +68,6 @@ function(add_tox_test name) |
449 |
+ endif() |
450 |
+ string(REPLACE ";" "," tox_envs "${tox_envs}") |
451 |
+ find_package(Python3 QUIET REQUIRED) |
452 |
+- add_custom_command( |
453 |
+- OUTPUT ${venv_path}/bin/activate |
454 |
+- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python="${Python3_EXECUTABLE}" ${venv_path} |
455 |
+- WORKING_DIRECTORY ${tox_path} |
456 |
+- COMMENT "preparing venv for ${name}") |
457 |
+- add_custom_target(${name}-venv |
458 |
+- DEPENDS ${venv_path}/bin/activate) |
459 |
+- add_dependencies(tests ${name}-venv) |
460 |
+ add_test( |
461 |
+ NAME ${test_name} |
462 |
+ COMMAND ${CMAKE_SOURCE_DIR}/src/script/run_tox.sh |
463 |
+diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt |
464 |
+index 4224499c47..9a6c87595b 100644 |
465 |
+--- a/src/ceph-volume/CMakeLists.txt |
466 |
++++ b/src/ceph-volume/CMakeLists.txt |
467 |
+@@ -8,22 +8,6 @@ if(FREEBSD) |
468 |
+ add_subdirectory(plugin/zfs) |
469 |
+ endif() |
470 |
+ |
471 |
+-# Required for running ceph-volume inventory in a vstart environment |
472 |
+-set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv) |
473 |
+- |
474 |
+-add_custom_command( |
475 |
+- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python |
476 |
+- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${Python_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV} |
477 |
+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume |
478 |
+- COMMENT "ceph-volume venv is being created") |
479 |
+- |
480 |
+-add_custom_command( |
481 |
+- OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume |
482 |
+- DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python |
483 |
+- COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate |
484 |
+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume |
485 |
+- COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume") |
486 |
+- |
487 |
+ add_custom_target(ceph-volume-venv-setup |
488 |
+ DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume) |
489 |
+ |
490 |
+diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt |
491 |
+index 92e4cdc538..3153c93c45 100644 |
492 |
+--- a/src/pybind/mgr/dashboard/CMakeLists.txt |
493 |
++++ b/src/pybind/mgr/dashboard/CMakeLists.txt |
494 |
+@@ -5,9 +5,6 @@ function(add_npm_command) |
495 |
+ set(multi_kw COMMAND DEPENDS) |
496 |
+ cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) |
497 |
+ string(REPLACE ";" " " command "${NC_COMMAND}") |
498 |
+- if(NC_NODEENV) |
499 |
+- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) |
500 |
+- endif() |
501 |
+ string(REPLACE " " ";" command "${command}") |
502 |
+ add_custom_command( |
503 |
+ OUTPUT "${NC_OUTPUT}" |
504 |
+@@ -29,10 +26,8 @@ else() |
505 |
+ set(nodeenv NODEENV) |
506 |
+ |
507 |
+ add_custom_command( |
508 |
+- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" |
509 |
+- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} |
510 |
+- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv |
511 |
+- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose -p --node=10.18.1 |
512 |
++ OUTPUT "npm" |
513 |
++ COMMAND nodeenv --verbose -p --node=10.18.1 |
514 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
515 |
+ COMMENT "dashboard nodeenv is being installed" |
516 |
+ ) |