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