1 |
commit: f85541d10c3ae4ea7feacc2008a278e4dee25044 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 13 10:58:30 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 13 10:58:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85541d1 |
7 |
|
8 |
sys-cluster/ceph: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-cluster/ceph/Manifest | 1 - |
13 |
sys-cluster/ceph/ceph-14.2.22-r1.ebuild | 394 --------------------- |
14 |
.../files/ceph-14.2.0-mgr-python-version.patch | 17 - |
15 |
.../ceph/files/ceph-14.2.11-systemd-unit-fix.patch | 27 -- |
16 |
.../files/ceph-14.2.22-build-without-mgr.patch | 32 -- |
17 |
sys-cluster/ceph/files/ceph-14.2.22-cflags.patch | 25 -- |
18 |
.../ceph/files/ceph-14.2.22-no-virtualenvs.patch | 39 -- |
19 |
.../ceph/files/ceph-14.2.22-snappy-uint32.patch | 13 - |
20 |
.../files/ceph-14.2.3-dpdk-compile-fix-1.patch | 111 ------ |
21 |
.../ceph/files/ceph-14.2.4-python-executable.patch | 29 -- |
22 |
.../files/ceph-14.2.4-undefined-behaviour.patch | 76 ---- |
23 |
11 files changed, 764 deletions(-) |
24 |
|
25 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
26 |
index 884ad263bca6..325977641159 100644 |
27 |
--- a/sys-cluster/ceph/Manifest |
28 |
+++ b/sys-cluster/ceph/Manifest |
29 |
@@ -1,4 +1,3 @@ |
30 |
-DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad15d16690dcbd1511d1b506477845efc3ff7fbe713cf18fb8cfcc8c16707ad2a0f30159e3198ff82e57fbd2eb3cf2 SHA512 1c66661e1a39fa9151e95e33c390b810ffe269465d8785e2197cc15b8d83bd2edde77de48a8abd71a4da68cd5830ff14bcdf6b98fd17edabe85caeb1eca018d3 |
31 |
DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b |
32 |
DIST ceph-16.2.7.tar.gz 156621262 BLAKE2B 3c79cb1586e71927df4578fe7f3a13f4ab257a5e145b6bf76d942292cbca7bf32583350373f3d816f6d8f8700ee0f98a14f350c823b0eb89ffd7735acee7de63 SHA512 eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c |
33 |
DIST ceph-17.2.0.tar.gz 168742006 BLAKE2B 15272da3471722936198f62b5ef7537d29bd944b35ef1552e87cf0f0f400a8be5fd1fa873494eb17ca71df9360d7ffa4fa20a6f1b1ba819520b180770a4e6299 SHA512 70b96e709f153f16069bec8346ea73812d699eaab91a012351d02addb3fd176b84fce32c3dae84fdf91d0ffe49f2bb258410b47caeee81d81a672b4dbd04cc7e |
34 |
|
35 |
diff --git a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild |
36 |
deleted file mode 100644 |
37 |
index 860ccfb14768..000000000000 |
38 |
--- a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,394 +0,0 @@ |
41 |
-# Copyright 1999-2022 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=7 |
45 |
-PYTHON_COMPAT=( python3_{7,8} ) |
46 |
-CMAKE_MAKEFILE_GENERATOR=emake |
47 |
- |
48 |
-DISTUTILS_OPTIONAL=1 |
49 |
- |
50 |
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ |
51 |
- python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles |
52 |
- |
53 |
-if [[ ${PV} == *9999* ]]; then |
54 |
- inherit git-r3 |
55 |
- EGIT_REPO_URI="https://github.com/ceph/ceph.git" |
56 |
- SRC_URI="" |
57 |
-else |
58 |
- SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" |
59 |
- KEYWORDS="~amd64 ~ppc64" |
60 |
-fi |
61 |
- |
62 |
-DESCRIPTION="Ceph distributed filesystem" |
63 |
-HOMEPAGE="https://ceph.com/" |
64 |
- |
65 |
-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" |
66 |
-SLOT="0" |
67 |
- |
68 |
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) |
69 |
- |
70 |
-IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc |
71 |
- kafka kerberos ldap lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost |
72 |
- systemd +tcmalloc test xfs zfs" |
73 |
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
74 |
- |
75 |
-DEPEND=" |
76 |
- acct-group/ceph |
77 |
- acct-user/ceph |
78 |
- virtual/libudev:= |
79 |
- app-arch/bzip2:= |
80 |
- app-arch/lz4:= |
81 |
- app-arch/snappy:= |
82 |
- app-arch/zstd:= |
83 |
- app-shells/bash:0 |
84 |
- app-misc/jq:= |
85 |
- dev-libs/crypto++:= |
86 |
- <dev-libs/leveldb-1.21:=[snappy,tcmalloc(-)?] |
87 |
- dev-libs/libaio:= |
88 |
- dev-libs/libnl:3= |
89 |
- dev-libs/libxml2:= |
90 |
- <dev-libs/rocksdb-6.15:= |
91 |
- dev-libs/xmlsec:=[openssl] |
92 |
- dev-cpp/yaml-cpp:= |
93 |
- dev-libs/nss:= |
94 |
- dev-libs/protobuf:= |
95 |
- net-dns/c-ares:= |
96 |
- net-libs/gnutls:= |
97 |
- sys-auth/oath-toolkit:= |
98 |
- sys-apps/coreutils |
99 |
- sys-apps/grep |
100 |
- sys-apps/hwloc:= |
101 |
- sys-apps/keyutils:= |
102 |
- sys-apps/util-linux:= |
103 |
- sys-apps/sed |
104 |
- sys-apps/util-linux |
105 |
- sys-libs/libcap-ng:= |
106 |
- sys-libs/ncurses:0= |
107 |
- sys-libs/zlib:= |
108 |
- sys-process/numactl:= |
109 |
- x11-libs/libpciaccess:= |
110 |
- virtual/libcrypt:= |
111 |
- babeltrace? ( dev-util/babeltrace ) |
112 |
- fuse? ( sys-fs/fuse:0= ) |
113 |
- jemalloc? ( dev-libs/jemalloc:= ) |
114 |
- !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) |
115 |
- kafka? ( dev-libs/librdkafka:= ) |
116 |
- kerberos? ( virtual/krb5 ) |
117 |
- ldap? ( net-nds/openldap:= ) |
118 |
- lttng? ( dev-util/lttng-ust:= ) |
119 |
- rabbitmq? ( net-libs/rabbitmq-c:= ) |
120 |
- radosgw? ( |
121 |
- dev-libs/expat:= |
122 |
- dev-libs/openssl:= |
123 |
- net-misc/curl:=[curl_ssl_openssl] |
124 |
- ) |
125 |
- ssl? ( dev-libs/openssl:= ) |
126 |
- system-boost? ( dev-libs/boost:=[threads(+),context,python,${PYTHON_USEDEP}] ) |
127 |
- xfs? ( sys-fs/xfsprogs:= ) |
128 |
- zfs? ( sys-fs/zfs:= ) |
129 |
-" |
130 |
-BDEPEND=" |
131 |
- ${PYTHON_DEPS} |
132 |
- amd64? ( dev-lang/yasm ) |
133 |
- x86? ( dev-lang/yasm ) |
134 |
- app-arch/cpio |
135 |
- >=dev-util/cmake-3.5.0 |
136 |
- dev-python/cython[${PYTHON_USEDEP}] |
137 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
138 |
- dev-python/sphinx |
139 |
- dev-util/cunit |
140 |
- dev-util/gperf |
141 |
- dev-util/ragel |
142 |
- dev-util/valgrind |
143 |
- sys-apps/coreutils |
144 |
- sys-apps/grep |
145 |
- sys-apps/sed |
146 |
- sys-apps/which |
147 |
- sys-devel/bc |
148 |
- sys-devel/patch |
149 |
- virtual/pkgconfig |
150 |
- test? ( |
151 |
- dev-python/coverage[${PYTHON_USEDEP}] |
152 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
153 |
- dev-python/requests-mock[${PYTHON_USEDEP}] |
154 |
- sys-apps/grep[pcre] |
155 |
- sys-fs/btrfs-progs |
156 |
- ) |
157 |
-" |
158 |
-RDEPEND="${DEPEND} |
159 |
- ${PYTHON_DEPS} |
160 |
- app-admin/sudo |
161 |
- net-misc/socat |
162 |
- sys-apps/gptfdisk |
163 |
- >=sys-apps/smartmontools-7.0 |
164 |
- sys-block/parted |
165 |
- sys-fs/cryptsetup |
166 |
- sys-fs/lsscsi |
167 |
- sys-fs/lvm2[-device-mapper-only(-)] |
168 |
- virtual/awk |
169 |
- dev-python/bcrypt[${PYTHON_USEDEP}] |
170 |
- dev-python/cherrypy[${PYTHON_USEDEP}] |
171 |
- dev-python/flask[${PYTHON_USEDEP}] |
172 |
- dev-python/jinja[${PYTHON_USEDEP}] |
173 |
- dev-python/pecan[${PYTHON_USEDEP}] |
174 |
- dev-python/prettytable[${PYTHON_USEDEP}] |
175 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
176 |
- dev-python/requests[${PYTHON_USEDEP}] |
177 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
178 |
- dev-python/werkzeug[${PYTHON_USEDEP}] |
179 |
- mgr? ( |
180 |
- dev-python/more-itertools[${PYTHON_USEDEP}] |
181 |
- dev-python/numpy[${PYTHON_USEDEP}] |
182 |
- <dev-python/pyjwt-2.0[${PYTHON_USEDEP}] |
183 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
184 |
- dev-python/routes[${PYTHON_USEDEP}] |
185 |
- sci-libs/scikit-learn[${PYTHON_USEDEP}] |
186 |
- dev-python/six[${PYTHON_USEDEP}] |
187 |
- ) |
188 |
-" |
189 |
-# diskprediction needs older scipy not compatible with py38 |
190 |
-# bug #724438 |
191 |
-REQUIRED_USE=" |
192 |
- ${PYTHON_REQUIRED_USE} |
193 |
- ?? ( jemalloc tcmalloc ) |
194 |
- diskprediction? ( mgr !python_targets_python3_8 ) |
195 |
- kafka? ( radosgw ) |
196 |
- mgr? ( cephfs ) |
197 |
- rabbitmq? ( radosgw ) |
198 |
-" |
199 |
-RESTRICT="!test? ( test )" |
200 |
- |
201 |
-# the tests need root access |
202 |
-RESTRICT="test? ( userpriv )" |
203 |
- |
204 |
-# distribution tarball does not include everything needed for tests |
205 |
-RESTRICT+=" test" |
206 |
- |
207 |
-# create a non-debug release |
208 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
209 |
- |
210 |
-# false positives unless all USE flags are on |
211 |
-CMAKE_WARN_UNUSED_CLI=no |
212 |
- |
213 |
-PATCHES=( |
214 |
- "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
215 |
- "${FILESDIR}/ceph-14.2.0-cflags.patch" |
216 |
- "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" |
217 |
- "${FILESDIR}/ceph-14.2.22-cflags.patch" |
218 |
- "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch" |
219 |
- "${FILESDIR}/ceph-14.2.22-no-virtualenvs.patch" |
220 |
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
221 |
- "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" |
222 |
- "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" |
223 |
- "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch" |
224 |
- "${FILESDIR}/ceph-14.2.4-python-executable.patch" |
225 |
- "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch" |
226 |
- "${FILESDIR}/ceph-14.2.22-build-without-mgr.patch" |
227 |
- "${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch" |
228 |
- "${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch" |
229 |
- "${FILESDIR}/ceph-14.2.22-snappy-uint32.patch" |
230 |
-) |
231 |
- |
232 |
-check-reqs_export_vars() { |
233 |
- CHECKREQS_DISK_BUILD="5200M" |
234 |
- CHECKREQS_DISK_USR="510M" |
235 |
- |
236 |
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR |
237 |
-} |
238 |
- |
239 |
-pkg_pretend() { |
240 |
- check-reqs_export_vars |
241 |
- check-reqs_pkg_pretend |
242 |
-} |
243 |
- |
244 |
-pkg_setup() { |
245 |
- python_setup |
246 |
- check-reqs_export_vars |
247 |
- check-reqs_pkg_setup |
248 |
-} |
249 |
- |
250 |
-src_prepare() { |
251 |
- cmake_src_prepare |
252 |
- |
253 |
- if use system-boost; then |
254 |
- find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ |
255 |
- | xargs --null sed -r \ |
256 |
- -e 's|Boost::|boost_|g' \ |
257 |
- -e 's|Boost_|boost_|g' \ |
258 |
- -e 's|[Bb]oost_boost|boost_system|g' -i || die |
259 |
- fi |
260 |
- |
261 |
- sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ |
262 |
- -i src/bash_completion/CMakeLists.txt || die |
263 |
- |
264 |
- sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die |
265 |
- |
266 |
- if ! use diskprediction; then |
267 |
- rm -rf src/pybind/mgr/diskprediction_local || die |
268 |
- fi |
269 |
- |
270 |
- # remove tests that need root access |
271 |
- rm src/test/cli/ceph-authtool/cap*.t || die |
272 |
-} |
273 |
- |
274 |
-ceph_src_configure() { |
275 |
- local flag |
276 |
- local mycmakeargs=( |
277 |
- -DWITH_BABELTRACE=$(usex babeltrace) |
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_SSL=$(usex ssl) |
295 |
- -DWITH_SYSTEMD=$(usex systemd) |
296 |
- -DWITH_TESTS=$(usex test) |
297 |
- -DWITH_XFS=$(usex xfs) |
298 |
- -DWITH_ZFS=$(usex zfs) |
299 |
- -DENABLE_SHARED="ON" |
300 |
- -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") |
301 |
- -DWITH_SYSTEM_BOOST=$(usex system-boost) |
302 |
- -DBOOST_J=$(makeopts_jobs) |
303 |
- -DWITH_SYSTEM_ROCKSDB=ON |
304 |
- -DWITH_RDMA=OFF |
305 |
- -DWITH_TBB=OFF |
306 |
- -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) |
307 |
- -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir) |
308 |
- -DEPYTHON_VERSION="${EPYTHON#python}" |
309 |
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
310 |
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" |
311 |
- -Wno-dev |
312 |
- ) |
313 |
- if use amd64 || use x86; then |
314 |
- for flag in ${CPU_FLAGS_X86[@]}; do |
315 |
- mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") |
316 |
- done |
317 |
- fi |
318 |
- |
319 |
- # needed for >=glibc-2.32 |
320 |
- has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON) |
321 |
- |
322 |
- rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ |
323 |
- || die "failed to remove cmake cache" |
324 |
- |
325 |
- cmake_src_configure |
326 |
- |
327 |
- # bug #630232 |
328 |
- sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
329 |
- "${BUILD_DIR:-${S}}"/include/acconfig.h \ |
330 |
- || die "sed failed" |
331 |
-} |
332 |
- |
333 |
-src_configure() { |
334 |
- use custom-cflags || strip-flags |
335 |
- ceph_src_configure |
336 |
-} |
337 |
- |
338 |
-python_compile() { |
339 |
- local CMAKE_USE_DIR="${S}" |
340 |
- ceph_src_configure |
341 |
- |
342 |
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
343 |
- emake VERBOSE=1 clean |
344 |
- emake VERBOSE=1 all |
345 |
- |
346 |
- # python modules are only compiled with "make install" so we need to do this to |
347 |
- # prevent doing a bunch of compilation in src_install |
348 |
- DESTDIR="${T}" emake VERBOSE=1 install |
349 |
- popd >/dev/null || die |
350 |
-} |
351 |
- |
352 |
-src_compile() { |
353 |
- cmake_build VERBOSE=1 all |
354 |
- |
355 |
- # we have to do this here to prevent from building everything multiple times |
356 |
- python_copy_sources |
357 |
- python_foreach_impl python_compile |
358 |
-} |
359 |
- |
360 |
-src_test() { |
361 |
- make check || die "make check failed" |
362 |
-} |
363 |
- |
364 |
-python_install() { |
365 |
- local CMAKE_USE_DIR="${S}" |
366 |
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
367 |
- DESTDIR="${ED}" emake VERBOSE=1 install |
368 |
- popd >/dev/null || die |
369 |
- |
370 |
- python_optimize |
371 |
-} |
372 |
- |
373 |
-src_install() { |
374 |
- cmake_src_install |
375 |
- python_foreach_impl python_install |
376 |
- |
377 |
- find "${ED}" -name '*.la' -type f -delete || die |
378 |
- |
379 |
- exeinto /usr/$(get_libdir)/ceph |
380 |
- newexe "${BUILD_DIR}/bin/init-ceph" init-ceph |
381 |
- |
382 |
- insinto /etc/logrotate.d/ |
383 |
- newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
384 |
- |
385 |
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
386 |
- |
387 |
- fowners -R ceph:ceph /var/log/ceph |
388 |
- |
389 |
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap |
390 |
- newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} |
391 |
- newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
392 |
- |
393 |
- insinto /etc/sysctl.d |
394 |
- newins "${FILESDIR}"/sysctld 90-${PN}.conf |
395 |
- |
396 |
- use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc |
397 |
- |
398 |
- # units aren't installed by the build system unless systemd is enabled |
399 |
- # so no point installing these with the USE flag disabled |
400 |
- if use systemd; then |
401 |
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ |
402 |
- "ceph-mds@.service" |
403 |
- |
404 |
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ |
405 |
- "ceph-osd@.service" |
406 |
- |
407 |
- fi |
408 |
- |
409 |
- udev_dorules udev/*.rules |
410 |
- newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf |
411 |
- |
412 |
- readme.gentoo_create_doc |
413 |
- |
414 |
- python_setup |
415 |
- |
416 |
- # bug #630232 |
417 |
- sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ |
418 |
- || die "sed failed" |
419 |
- |
420 |
- python_fix_shebang "${ED}"/usr/{,s}bin/ |
421 |
- |
422 |
- # python_fix_shebang apparently is not idempotent |
423 |
- local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' |
424 |
- grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ |
425 |
- | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die |
426 |
- |
427 |
- local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) |
428 |
- dostrip -x "${rados_classes[@]#${ED}}" |
429 |
-} |
430 |
- |
431 |
-pkg_postinst() { |
432 |
- readme.gentoo_print_elog |
433 |
- tmpfiles_process ${PN}.conf |
434 |
-} |
435 |
|
436 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch b/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch |
437 |
deleted file mode 100644 |
438 |
index e4502a608ec2..000000000000 |
439 |
--- a/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch |
440 |
+++ /dev/null |
441 |
@@ -1,17 +0,0 @@ |
442 |
-diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt |
443 |
-index 664543172a..e74d73c084 100644 |
444 |
---- a/src/pybind/CMakeLists.txt |
445 |
-+++ b/src/pybind/CMakeLists.txt |
446 |
-@@ -62,12 +62,6 @@ foreach(python_version ${py_vers}) |
447 |
- endforeach() |
448 |
- |
449 |
- if(WITH_MGR) |
450 |
-- if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2) |
451 |
-- message(FATAL_ERROR "mgr plugins require python2 binding") |
452 |
-- elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3) |
453 |
-- message(FATAL_ERROR "mgr plugins require python3 binding") |
454 |
-- endif() |
455 |
-- |
456 |
- if(USE_OPENSSL) |
457 |
- execute_process( |
458 |
- COMMAND ${PYTHON${PYTHON_VERSION}_EXECUTABLE} -c "import ssl; print('.'.join(map(str,ssl.OPENSSL_VERSION_INFO[0:3])))" |
459 |
|
460 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch |
461 |
deleted file mode 100644 |
462 |
index 7309fea029e1..000000000000 |
463 |
--- a/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch |
464 |
+++ /dev/null |
465 |
@@ -1,27 +0,0 @@ |
466 |
-From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001 |
467 |
-From: Jan Fajerski <jfajerski@××××.com> |
468 |
-Date: Fri, 12 Jun 2020 09:27:36 +0200 |
469 |
-Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in |
470 |
- /usr/libexec |
471 |
- |
472 |
-Fixes: https://tracker.ceph.com/issues/45984 |
473 |
-Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29 |
474 |
- |
475 |
-Signed-off-by: Jan Fajerski <jfajerski@××××.com> |
476 |
---- |
477 |
- systemd/ceph-osd@××××××××.in | 2 +- |
478 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
479 |
- |
480 |
-diff --git a/systemd/ceph-osd@××××××××.in b/systemd/ceph-osd@××××××××.in |
481 |
-index a0067d347220..4a2254e99478 100644 |
482 |
---- a/systemd/ceph-osd@××××××××.in |
483 |
-+++ b/systemd/ceph-osd@××××××××.in |
484 |
-@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph |
485 |
- EnvironmentFile=-@SYSTEMD_ENV_FILE@ |
486 |
- Environment=CLUSTER=ceph |
487 |
- ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph |
488 |
--ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i |
489 |
-+ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i |
490 |
- ExecReload=/bin/kill -HUP $MAINPID |
491 |
- LockPersonality=true |
492 |
- MemoryDenyWriteExecute=true |
493 |
|
494 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.22-build-without-mgr.patch b/sys-cluster/ceph/files/ceph-14.2.22-build-without-mgr.patch |
495 |
deleted file mode 100644 |
496 |
index f3ba34cc165c..000000000000 |
497 |
--- a/sys-cluster/ceph/files/ceph-14.2.22-build-without-mgr.patch |
498 |
+++ /dev/null |
499 |
@@ -1,32 +0,0 @@ |
500 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
501 |
-index ed4bbc75d44..5f5e72918d2 100644 |
502 |
---- a/src/CMakeLists.txt |
503 |
-+++ b/src/CMakeLists.txt |
504 |
-@@ -451,9 +451,7 @@ if(WITH_LIBRADOSSTRIPER) |
505 |
- add_subdirectory(libradosstriper) |
506 |
- endif() |
507 |
- |
508 |
--if(WITH_MGR) |
509 |
-- add_subdirectory(mgr) |
510 |
--endif() |
511 |
-+add_subdirectory(mgr) |
512 |
- |
513 |
- set(librados_config_srcs |
514 |
- librados-config.cc) |
515 |
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt |
516 |
-index e7caaeff099..b4f13c05184 100644 |
517 |
---- a/src/mgr/CMakeLists.txt |
518 |
-+++ b/src/mgr/CMakeLists.txt |
519 |
-@@ -1,6 +1,7 @@ |
520 |
- add_library(mgr_cap_obj OBJECT |
521 |
- MgrCap.cc) |
522 |
- |
523 |
-+if(WITH_MGR) |
524 |
- set(mgr_srcs |
525 |
- ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc |
526 |
- ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc |
527 |
-@@ -36,3 +37,4 @@ target_link_libraries(ceph-mgr |
528 |
- set_target_properties(ceph-mgr PROPERTIES |
529 |
- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) |
530 |
- install(TARGETS ceph-mgr DESTINATION bin) |
531 |
-+endif() |
532 |
|
533 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.22-cflags.patch b/sys-cluster/ceph/files/ceph-14.2.22-cflags.patch |
534 |
deleted file mode 100644 |
535 |
index 5c9f17098616..000000000000 |
536 |
--- a/sys-cluster/ceph/files/ceph-14.2.22-cflags.patch |
537 |
+++ /dev/null |
538 |
@@ -1,25 +0,0 @@ |
539 |
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake |
540 |
-index eaab331413b..4ee3f1b0768 100644 |
541 |
---- a/cmake/modules/BuildBoost.cmake |
542 |
-+++ b/cmake/modules/BuildBoost.cmake |
543 |
-@@ -62,7 +62,7 @@ function(do_build_boost version) |
544 |
- else() |
545 |
- list(APPEND boost_features "address-model=32") |
546 |
- endif() |
547 |
-- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX |
548 |
-+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX |
549 |
- list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") |
550 |
- |
551 |
- set(boost_with_libs) |
552 |
-diff --git a/cmake/modules/BuildZstd.cmake b/cmake/modules/BuildZstd.cmake |
553 |
-index 799b14b281d..9b4b5ee8dcf 100644 |
554 |
---- a/cmake/modules/BuildZstd.cmake |
555 |
-+++ b/cmake/modules/BuildZstd.cmake |
556 |
-@@ -1,6 +1,6 @@ |
557 |
- # libzstd - build it statically |
558 |
- function(build_Zstd) |
559 |
-- set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3") |
560 |
-+ set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable $ENV{CFLAGS} -O3") |
561 |
- |
562 |
- include(ExternalProject) |
563 |
- ExternalProject_Add(zstd_ext |
564 |
|
565 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.22-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.22-no-virtualenvs.patch |
566 |
deleted file mode 100644 |
567 |
index 534133122f99..000000000000 |
568 |
--- a/sys-cluster/ceph/files/ceph-14.2.22-no-virtualenvs.patch |
569 |
+++ /dev/null |
570 |
@@ -1,39 +0,0 @@ |
571 |
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt |
572 |
-index 7c9cc4abd56..9f84b0c2b26 100644 |
573 |
---- a/src/pybind/mgr/dashboard/CMakeLists.txt |
574 |
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt |
575 |
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) |
576 |
- |
577 |
- add_custom_target(mgr-dashboard-test-venv |
578 |
- COMMAND |
579 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
580 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
581 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard |
582 |
- COMMENT "dashboard tests virtualenv is being created") |
583 |
- add_dependencies(tests mgr-dashboard-test-venv) |
584 |
-@@ -14,9 +14,9 @@ function(add_npm_command) |
585 |
- set(multi_kw COMMAND DEPENDS) |
586 |
- cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) |
587 |
- string(REPLACE ";" " " command "${NC_COMMAND}") |
588 |
-- if(NC_NODEENV) |
589 |
-- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) |
590 |
-- endif() |
591 |
-+ #if(NC_NODEENV) |
592 |
-+ # string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) |
593 |
-+ #endif() |
594 |
- string(REPLACE " " ";" command "${command}") |
595 |
- add_custom_command( |
596 |
- OUTPUT "${NC_OUTPUT}" |
597 |
-@@ -41,9 +41,9 @@ else() |
598 |
- |
599 |
- add_custom_command( |
600 |
- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" |
601 |
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} |
602 |
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv |
603 |
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose -p --node=10.13.0 |
604 |
-+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} |
605 |
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv |
606 |
-+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose -p --node=10.13.0 |
607 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
608 |
- COMMENT "dashboard nodeenv is being installed" |
609 |
- ) |
610 |
|
611 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch |
612 |
deleted file mode 100644 |
613 |
index c783558a1758..000000000000 |
614 |
--- a/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch |
615 |
+++ /dev/null |
616 |
@@ -1,13 +0,0 @@ |
617 |
-diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h |
618 |
-index 0291a923112..352ab9a9bcf 100644 |
619 |
---- a/src/compressor/snappy/SnappyCompressor.h |
620 |
-+++ b/src/compressor/snappy/SnappyCompressor.h |
621 |
-@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { |
622 |
- if (qat_enabled) |
623 |
- return qat_accel.decompress(p, compressed_len, dst); |
624 |
- #endif |
625 |
-- snappy::uint32 res_len = 0; |
626 |
-+ uint32_t res_len = 0; |
627 |
- BufferlistSource source_1(p, compressed_len); |
628 |
- if (!snappy::GetUncompressedLength(&source_1, &res_len)) { |
629 |
- return -1; |
630 |
|
631 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch b/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch |
632 |
deleted file mode 100644 |
633 |
index ef06758326e9..000000000000 |
634 |
--- a/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch |
635 |
+++ /dev/null |
636 |
@@ -1,111 +0,0 @@ |
637 |
-diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc |
638 |
-index 3101ae57ac..1db97c289a 100644 |
639 |
---- a/src/msg/async/dpdk/DPDKStack.cc |
640 |
-+++ b/src/msg/async/dpdk/DPDKStack.cc |
641 |
-@@ -203,7 +203,9 @@ DPDKWorker::Impl::~Impl() |
642 |
- _dev->unset_local_queue(id); |
643 |
- } |
644 |
- |
645 |
--int DPDKWorker::listen(entity_addr_t &sa, const SocketOptions &opt, |
646 |
-+int DPDKWorker::listen(entity_addr_t &sa, |
647 |
-+ unsigned addr_slot, |
648 |
-+ const SocketOptions &opt, |
649 |
- ServerSocket *sock) |
650 |
- { |
651 |
- ceph_assert(sa.get_family() == AF_INET); |
652 |
-diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h |
653 |
-index a44ae38367..622ff8a3c6 100644 |
654 |
---- a/src/msg/async/dpdk/DPDKStack.h |
655 |
-+++ b/src/msg/async/dpdk/DPDKStack.h |
656 |
-@@ -37,7 +37,7 @@ class DPDKServerSocketImpl : public ServerSocketImpl { |
657 |
- typename Protocol::listener _listener; |
658 |
- public: |
659 |
- DPDKServerSocketImpl(Protocol& proto, uint16_t port, const SocketOptions &opt, |
660 |
-- int type); |
661 |
-+ int type, unsigned addr_slot); |
662 |
- int listen() { |
663 |
- return _listener.listen(); |
664 |
- } |
665 |
-@@ -184,8 +184,9 @@ class NativeConnectedSocketImpl : public ConnectedSocketImpl { |
666 |
- |
667 |
- template <typename Protocol> |
668 |
- DPDKServerSocketImpl<Protocol>::DPDKServerSocketImpl( |
669 |
-- Protocol& proto, uint16_t port, const SocketOptions &opt, int type) |
670 |
-- : ServerSocketImpl(type), _listener(proto.listen(port)) {} |
671 |
-+ Protocol& proto, uint16_t port, const SocketOptions &opt, |
672 |
-+ int type, unsigned addr_slot) |
673 |
-+ : ServerSocketImpl(type, addr_slot), _listener(proto.listen(port)) {} |
674 |
- |
675 |
- template <typename Protocol> |
676 |
- int DPDKServerSocketImpl<Protocol>::accept(ConnectedSocket *s, const SocketOptions &options, entity_addr_t *out, Worker *w) { |
677 |
-@@ -229,7 +230,8 @@ class DPDKWorker : public Worker { |
678 |
- |
679 |
- public: |
680 |
- explicit DPDKWorker(CephContext *c, unsigned i): Worker(c, i) {} |
681 |
-- virtual int listen(entity_addr_t &addr, const SocketOptions &opts, ServerSocket *) override; |
682 |
-+ virtual int listen(entity_addr_t &addr, unsigned addr_slot, |
683 |
-+ const SocketOptions &opts, ServerSocket *) override; |
684 |
- virtual int connect(const entity_addr_t &addr, const SocketOptions &opts, ConnectedSocket *socket) override; |
685 |
- void arp_learn(ethernet_address l2, ipv4_address l3) { |
686 |
- _impl->_inet.learn(l2, l3); |
687 |
-diff --git a/src/msg/async/dpdk/TCP.cc b/src/msg/async/dpdk/TCP.cc |
688 |
-index c6397709b1..26f29e10f7 100644 |
689 |
---- a/src/msg/async/dpdk/TCP.cc |
690 |
-+++ b/src/msg/async/dpdk/TCP.cc |
691 |
-@@ -153,9 +153,10 @@ bool ipv4_tcp::forward(forward_hash& out_hash_data, Packet& p, size_t off) |
692 |
- } |
693 |
- |
694 |
- int tcpv4_listen(tcp<ipv4_traits>& tcpv4, uint16_t port, const SocketOptions &opts, |
695 |
-- int type, ServerSocket *sock) |
696 |
-+ int type, unsigned addr_slot, ServerSocket *sock) |
697 |
- { |
698 |
-- auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts, type); |
699 |
-+ auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts, |
700 |
-+ type, addr_slot); |
701 |
- int r = p->listen(); |
702 |
- if (r < 0) { |
703 |
- delete p; |
704 |
-diff --git a/src/msg/async/dpdk/DPDK.h b/src/msg/async/dpdk/DPDK.h |
705 |
-index fa12af6b27..6bb52973e0 100644 |
706 |
---- a/src/msg/async/dpdk/DPDK.h |
707 |
-+++ b/src/msg/async/dpdk/DPDK.h |
708 |
-@@ -833,7 +833,7 @@ class DPDKDevice { |
709 |
- subscription<Packet> receive(unsigned cpuid, std::function<int (Packet)> next_packet) { |
710 |
- auto sub = _queues[cpuid]->_rx_stream.listen(std::move(next_packet)); |
711 |
- _queues[cpuid]->rx_start(); |
712 |
-- return std::move(sub); |
713 |
-+ return sub; |
714 |
- } |
715 |
- ethernet_address hw_address() { |
716 |
- struct ether_addr mac; |
717 |
-@@ -849,7 +849,7 @@ class DPDKDevice { |
718 |
- std::unique_ptr<DPDKQueuePair> init_local_queue(CephContext *c, EventCenter *center, string hugepages, uint16_t qid) { |
719 |
- std::unique_ptr<DPDKQueuePair> qp; |
720 |
- qp = std::unique_ptr<DPDKQueuePair>(new DPDKQueuePair(c, center, this, qid)); |
721 |
-- return std::move(qp); |
722 |
-+ return qp; |
723 |
- } |
724 |
- unsigned hash2qid(uint32_t hash) { |
725 |
- // return hash % hw_queues_count(); |
726 |
-diff --git a/src/msg/async/dpdk/Packet.h b/src/msg/async/dpdk/Packet.h |
727 |
-index db9cd2a764..f929da3178 100644 |
728 |
---- a/src/msg/async/dpdk/Packet.h |
729 |
-+++ b/src/msg/async/dpdk/Packet.h |
730 |
-@@ -125,7 +125,7 @@ class Packet { |
731 |
- n->rss_hash.construct(old->rss_hash); |
732 |
- std::copy(old->frags, old->frags + old->_nr_frags, n->frags); |
733 |
- old->copy_internal_fragment_to(n.get()); |
734 |
-- return std::move(n); |
735 |
-+ return n; |
736 |
- } |
737 |
- |
738 |
- static std::unique_ptr<impl> copy(impl* old) { |
739 |
-@@ -134,7 +134,7 @@ class Packet { |
740 |
- |
741 |
- static std::unique_ptr<impl> allocate_if_needed(std::unique_ptr<impl> old, size_t extra_frags) { |
742 |
- if (old->_allocated_frags >= old->_nr_frags + extra_frags) { |
743 |
-- return std::move(old); |
744 |
-+ return old; |
745 |
- } |
746 |
- return copy(old.get(), std::max<size_t>(old->_nr_frags + extra_frags, 2 * old->_nr_frags)); |
747 |
- } |
748 |
|
749 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch b/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch |
750 |
deleted file mode 100644 |
751 |
index 40feaf11ad39..000000000000 |
752 |
--- a/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch |
753 |
+++ /dev/null |
754 |
@@ -1,29 +0,0 @@ |
755 |
-diff --git a/src/ceph-crash.in b/src/ceph-crash.in |
756 |
-index 5bfb50c474..d53c4eeb6a 100755 |
757 |
---- a/src/ceph-crash.in |
758 |
-+++ b/src/ceph-crash.in |
759 |
-@@ -1,4 +1,4 @@ |
760 |
--#!@PYTHON_EXECUTABLE@ |
761 |
-+#!@PYTHON3_EXECUTABLE@ |
762 |
- # -*- mode:python -*- |
763 |
- # vim: ts=4 sw=4 smarttab expandtab |
764 |
- |
765 |
-diff --git a/src/ceph.in b/src/ceph.in |
766 |
-index f060023f57..3a84263ccc 100755 |
767 |
---- a/src/ceph.in |
768 |
-+++ b/src/ceph.in |
769 |
-@@ -1,4 +1,4 @@ |
770 |
--#!@PYTHON_EXECUTABLE@ |
771 |
-+#!@PYTHON3_EXECUTABLE@ |
772 |
- # -*- mode:python -*- |
773 |
- # vim: ts=4 sw=4 smarttab expandtab |
774 |
- # |
775 |
-@@ -66,7 +66,7 @@ DEVMODEMSG = '*** DEVELOPER MODE: setting PATH, PYTHONPATH and LD_LIBRARY_PATH * |
776 |
- def respawn_in_path(lib_path, pybind_path, pythonlib_path, asan_lib_path): |
777 |
- execv_cmd = [] |
778 |
- if 'CEPH_DBG' in os.environ: |
779 |
-- execv_cmd += ['@PYTHON_EXECUTABLE@', '-mpdb'] |
780 |
-+ execv_cmd += ['@PYTHON3_EXECUTABLE@', '-mpdb'] |
781 |
- |
782 |
- if platform.system() == "Darwin": |
783 |
- lib_path_var = "DYLD_LIBRARY_PATH" |
784 |
|
785 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch b/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch |
786 |
deleted file mode 100644 |
787 |
index 99249fb01a0c..000000000000 |
788 |
--- a/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch |
789 |
+++ /dev/null |
790 |
@@ -1,76 +0,0 @@ |
791 |
-diff --git a/src/include/blobhash.h b/src/include/blobhash.h |
792 |
-index 597884e4c9..97f2065ce3 100644 |
793 |
---- a/src/include/blobhash.h |
794 |
-+++ b/src/include/blobhash.h |
795 |
-@@ -14,33 +14,40 @@ |
796 |
- #ifndef CEPH_BLOBHASH_H |
797 |
- #define CEPH_BLOBHASH_H |
798 |
- |
799 |
-+#include <cstdint> |
800 |
- #include "hash.h" |
801 |
- |
802 |
--/* |
803 |
--- this is to make some of the STL types work with 64 bit values, string hash keys, etc. |
804 |
--- added when i was using an old STL.. maybe try taking these out and see if things |
805 |
-- compile now? |
806 |
--*/ |
807 |
-- |
808 |
- class blobhash { |
809 |
- public: |
810 |
-- uint32_t operator()(const char *p, unsigned len) { |
811 |
-- static rjhash<uint32_t> H; |
812 |
-- uint32_t acc = 0; |
813 |
-+ uint32_t operator()(const void* p, size_t len) { |
814 |
-+ static rjhash<std::uint32_t> H; |
815 |
-+ std::uint32_t acc = 0; |
816 |
-+ auto buf = static_cast<const unsigned char*>(p); |
817 |
- while (len >= sizeof(acc)) { |
818 |
-- acc ^= *(uint32_t*)p; |
819 |
-- p += sizeof(uint32_t); |
820 |
-- len -= sizeof(uint32_t); |
821 |
-+ acc ^= unaligned_load(buf); |
822 |
-+ buf += sizeof(std::uint32_t); |
823 |
-+ len -= sizeof(std::uint32_t); |
824 |
- } |
825 |
-- int sh = 0; |
826 |
-- while (len) { |
827 |
-- acc ^= (uint32_t)*p << sh; |
828 |
-- sh += 8; |
829 |
-- len--; |
830 |
-- p++; |
831 |
-+ // handle the last few bytes of p[-(len % 4):] |
832 |
-+ switch (len) { |
833 |
-+ case 3: |
834 |
-+ acc ^= buf[2] << 16; |
835 |
-+ [[fallthrough]]; |
836 |
-+ case 2: |
837 |
-+ acc ^= buf[1] << 8; |
838 |
-+ [[fallthrough]]; |
839 |
-+ case 1: |
840 |
-+ acc ^= buf[0]; |
841 |
-+ [[fallthrough]]; |
842 |
- } |
843 |
- return H(acc); |
844 |
- } |
845 |
-+private: |
846 |
-+ static inline std::uint32_t unaligned_load(const unsigned char* p) { |
847 |
-+ std::uint32_t result; |
848 |
-+ __builtin_memcpy(&result, p, sizeof(result)); |
849 |
-+ return result; |
850 |
-+ } |
851 |
- }; |
852 |
- |
853 |
- |
854 |
-diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h |
855 |
-index b6952ca498..576b7d6b8a 100644 |
856 |
---- a/src/msg/msg_types.h |
857 |
-+++ b/src/msg/msg_types.h |
858 |
-@@ -566,7 +566,7 @@ namespace std { |
859 |
- size_t operator()( const entity_addr_t& x ) const |
860 |
- { |
861 |
- static blobhash H; |
862 |
-- return H((const char*)&x, sizeof(x)); |
863 |
-+ return H(&x, sizeof(x)); |
864 |
- } |
865 |
- }; |
866 |
- } // namespace std |