| 1 |
commit: ba5c6e0933a6bece9944b7de265670a776506212 |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 22 15:23:08 2020 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 22 15:23:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ba5c6e09 |
| 7 |
|
| 8 |
sys-cluster/ceph: drop; fixed upstream and in gentoo.git |
| 9 |
|
| 10 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-cluster/ceph/Manifest | 2 - |
| 13 |
sys-cluster/ceph/ceph-12.2.11.ebuild | 318 ------------------ |
| 14 |
sys-cluster/ceph/ceph-12.2.12-r2.ebuild | 327 ------------------- |
| 15 |
sys-cluster/ceph/files/README.gentoo | 30 -- |
| 16 |
.../files/ceph-10.2.0-dont-use-virtualenvs.patch | 95 ------ |
| 17 |
sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch | 11 - |
| 18 |
.../ceph/files/ceph-10.2.1-unbundle-jerasure.patch | 355 --------------------- |
| 19 |
.../ceph/files/ceph-10.2.3-CVE-2016-8626.patch | 33 -- |
| 20 |
.../files/ceph-10.2.3-build-without-openldap.patch | 32 -- |
| 21 |
...ndings-and-tests-compatible-with-Python-3.patch | 22 -- |
| 22 |
...-Python-bindings-compatible-with-Python-3.patch | 45 --- |
| 23 |
.../ceph-10.2.7-fix-compilation-with-zstd.patch | 49 --- |
| 24 |
sys-cluster/ceph/files/ceph-10.2.9-cflags.patch | 15 - |
| 25 |
.../files/ceph-10.2.9-dont-run-lsb_release.patch | 65 ---- |
| 26 |
sys-cluster/ceph/files/ceph-12.2.0-cflags.patch | 13 - |
| 27 |
.../ceph-12.2.0-use-provided-cpu-flag-values.patch | 37 --- |
| 28 |
.../ceph/files/ceph-12.2.1-systemd-unitdir.patch | 10 - |
| 29 |
.../ceph/files/ceph-12.2.11-fix-min-call.patch | 13 - |
| 30 |
.../ceph-12.2.12-civetweb-openssl-1.1.1.patch | 10 - |
| 31 |
.../ceph-12.2.12-dont-use-bad-namespace.patch | 13 - |
| 32 |
.../ceph/files/ceph-12.2.12-ncurses-tinfo.patch | 20 -- |
| 33 |
.../ceph/files/ceph-12.2.12-qa-warning.patch | 13 - |
| 34 |
.../ceph-12.2.4-boost-build-none-options.patch | 26 -- |
| 35 |
sys-cluster/ceph/files/ceph-12.2.4-cflags.patch | 38 --- |
| 36 |
.../ceph/files/ceph-12.2.4-rocksdb-cflags.patch | 11 - |
| 37 |
.../ceph/files/ceph-12.2.5-boost-sonames.patch | 165 ---------- |
| 38 |
sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch | 55 ---- |
| 39 |
.../ceph/files/ceph-13.2.0-boost-sonames.patch | 166 ---------- |
| 40 |
sys-cluster/ceph/files/ceph-13.2.0-cflags.patch | 26 -- |
| 41 |
.../files/ceph-13.2.0-mgr-python-version.patch | 16 - |
| 42 |
.../ceph/files/ceph-13.2.0-no-virtualenvs.patch | 78 ----- |
| 43 |
.../ceph-13.2.2-dont-install-sysvinit-script.patch | 15 - |
| 44 |
sys-cluster/ceph/files/ceph-mds_at.service | 12 - |
| 45 |
sys-cluster/ceph/files/ceph-mds_at.service.conf | 4 - |
| 46 |
sys-cluster/ceph/files/ceph-osd_at.service | 13 - |
| 47 |
sys-cluster/ceph/files/ceph-osd_at.service.conf | 4 - |
| 48 |
sys-cluster/ceph/files/ceph.confd-r1 | 4 - |
| 49 |
sys-cluster/ceph/files/ceph.confd-r3 | 63 ---- |
| 50 |
sys-cluster/ceph/files/ceph.confd-r4 | 70 ---- |
| 51 |
sys-cluster/ceph/files/ceph.confd-r5 | 15 - |
| 52 |
sys-cluster/ceph/files/ceph.initd-r10 | 108 ------- |
| 53 |
sys-cluster/ceph/files/ceph.initd-r2 | 40 --- |
| 54 |
sys-cluster/ceph/files/ceph.initd-r7 | 87 ----- |
| 55 |
sys-cluster/ceph/files/ceph.initd-r8 | 95 ------ |
| 56 |
sys-cluster/ceph/files/ceph.initd-r9 | 97 ------ |
| 57 |
sys-cluster/ceph/files/ceph.logrotate | 18 -- |
| 58 |
sys-cluster/ceph/files/ceph.logrotate-r1 | 18 -- |
| 59 |
sys-cluster/ceph/files/ceph.logrotate-r2 | 33 -- |
| 60 |
sys-cluster/ceph/files/envd-tcmalloc | 1 - |
| 61 |
.../ceph/files/make-node-frontend-tarball.bash | 140 -------- |
| 62 |
sys-cluster/ceph/files/rbdmap.initd | 122 ------- |
| 63 |
sys-cluster/ceph/files/sysctld | 2 - |
| 64 |
sys-cluster/ceph/metadata.xml | 31 -- |
| 65 |
53 files changed, 3101 deletions(-) |
| 66 |
|
| 67 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
| 68 |
deleted file mode 100644 |
| 69 |
index 7ab4d89..0000000 |
| 70 |
--- a/sys-cluster/ceph/Manifest |
| 71 |
+++ /dev/null |
| 72 |
@@ -1,2 +0,0 @@ |
| 73 |
-DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef |
| 74 |
-DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc |
| 75 |
|
| 76 |
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 77 |
deleted file mode 100644 |
| 78 |
index dbd539a..0000000 |
| 79 |
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 80 |
+++ /dev/null |
| 81 |
@@ -1,318 +0,0 @@ |
| 82 |
-# Copyright 1999-2019 Gentoo Authors |
| 83 |
-# Distributed under the terms of the GNU General Public License v2 |
| 84 |
- |
| 85 |
-EAPI=6 |
| 86 |
-PYTHON_COMPAT=( python{2_7,3_{5,6}} ) |
| 87 |
-DISTUTILS_OPTIONAL=1 |
| 88 |
- |
| 89 |
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ |
| 90 |
- python-r1 udev user readme.gentoo-r1 systemd |
| 91 |
- |
| 92 |
-if [[ ${PV} == *9999* ]]; then |
| 93 |
- inherit git-r3 |
| 94 |
- EGIT_REPO_URI="https://github.com/ceph/ceph.git" |
| 95 |
- SRC_URI="" |
| 96 |
-else |
| 97 |
- SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" |
| 98 |
- KEYWORDS="~amd64 ~x86" |
| 99 |
-fi |
| 100 |
- |
| 101 |
-DESCRIPTION="Ceph distributed filesystem" |
| 102 |
-HOMEPAGE="https://ceph.com/" |
| 103 |
- |
| 104 |
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT" |
| 105 |
-SLOT="0" |
| 106 |
- |
| 107 |
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) |
| 108 |
- |
| 109 |
-IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng +mgr nss +radosgw +ssl" |
| 110 |
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" |
| 111 |
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
| 112 |
- |
| 113 |
-# unbundling code commented out pending bugs 584056 and 584058 |
| 114 |
-#>=dev-libs/jerasure-2.0.0-r1 |
| 115 |
-#>=dev-libs/gf-complete-2.0.0 |
| 116 |
-COMMON_DEPEND=" |
| 117 |
- virtual/libudev:= |
| 118 |
- app-arch/bzip2:=[static-libs?] |
| 119 |
- app-arch/lz4:=[static-libs?] |
| 120 |
- app-arch/snappy:=[static-libs?] |
| 121 |
- app-arch/zstd:=[static-libs?] |
| 122 |
- app-misc/jq:=[static-libs?] |
| 123 |
- <dev-libs/crypto++-7.0:=[static-libs?] |
| 124 |
- dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] |
| 125 |
- dev-libs/libaio:=[static-libs?] |
| 126 |
- dev-libs/libxml2:=[static-libs?] |
| 127 |
- sys-apps/keyutils:=[static-libs?] |
| 128 |
- sys-apps/util-linux:=[static-libs?] |
| 129 |
- sys-libs/zlib:=[static-libs?] |
| 130 |
- babeltrace? ( dev-util/babeltrace ) |
| 131 |
- ldap? ( net-nds/openldap:=[static-libs?] ) |
| 132 |
- lttng? ( dev-util/lttng-ust:= ) |
| 133 |
- nss? ( dev-libs/nss:= ) |
| 134 |
- fuse? ( sys-fs/fuse:0=[static-libs?] ) |
| 135 |
- xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 136 |
- zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 137 |
- ssl? ( |
| 138 |
- !libressl? ( <dev-libs/openssl-1.1:0=[static-libs?] ) |
| 139 |
- libressl? ( <dev-libs/libressl-2.8 ) |
| 140 |
- ) |
| 141 |
- radosgw? ( |
| 142 |
- dev-libs/expat:=[static-libs?] |
| 143 |
- !libressl? ( |
| 144 |
- <dev-libs/openssl-1.1:=[static-libs?] |
| 145 |
- net-misc/curl:=[curl_ssl_openssl,static-libs?] |
| 146 |
- ) |
| 147 |
- libressl? ( |
| 148 |
- <dev-libs/libressl-2.8:=[static-libs?] |
| 149 |
- net-misc/curl:=[curl_ssl_libressl,static-libs?] |
| 150 |
- ) |
| 151 |
- net-misc/curl:=[curl_ssl_openssl,static-libs?] |
| 152 |
- ) |
| 153 |
- system-boost? ( |
| 154 |
- =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] |
| 155 |
- ) |
| 156 |
- jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) |
| 157 |
- !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) |
| 158 |
- ${PYTHON_DEPS} |
| 159 |
- " |
| 160 |
-DEPEND="${COMMON_DEPEND} |
| 161 |
- app-arch/cpio |
| 162 |
- amd64? ( dev-lang/yasm ) |
| 163 |
- x86? ( dev-lang/yasm ) |
| 164 |
- dev-python/cython[${PYTHON_USEDEP}] |
| 165 |
- dev-python/sphinx |
| 166 |
- dev-util/gperf |
| 167 |
- dev-util/valgrind |
| 168 |
- sys-apps/which |
| 169 |
- sys-devel/bc |
| 170 |
- virtual/pkgconfig |
| 171 |
- test? ( |
| 172 |
- dev-python/tox[${PYTHON_USEDEP}] |
| 173 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
| 174 |
- sys-apps/grep[pcre] |
| 175 |
- sys-fs/btrfs-progs |
| 176 |
- )" |
| 177 |
-RDEPEND="${COMMON_DEPEND} |
| 178 |
- net-misc/socat |
| 179 |
- sys-apps/gptfdisk |
| 180 |
- sys-block/parted |
| 181 |
- sys-fs/e2fsprogs |
| 182 |
- sys-fs/cryptsetup |
| 183 |
- sys-fs/lvm2 |
| 184 |
- !<sys-apps/openrc-0.26.3 |
| 185 |
- dev-python/cherrypy[${PYTHON_USEDEP}] |
| 186 |
- dev-python/flask[${PYTHON_USEDEP}] |
| 187 |
- dev-python/jinja[${PYTHON_USEDEP}] |
| 188 |
- dev-python/pecan[${PYTHON_USEDEP}] |
| 189 |
- dev-python/prettytable[${PYTHON_USEDEP}] |
| 190 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 191 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 192 |
- dev-python/werkzeug[${PYTHON_USEDEP}] |
| 193 |
- " |
| 194 |
-REQUIRED_USE=" |
| 195 |
- $(python_gen_useflags 'python2*') |
| 196 |
- ${PYTHON_REQUIRED_USE} |
| 197 |
- ?? ( ssl nss ) |
| 198 |
- ?? ( jemalloc tcmalloc ) |
| 199 |
- " |
| 200 |
- |
| 201 |
-RESTRICT="test? ( userpriv )" |
| 202 |
- |
| 203 |
-# distribution tarball does not include everything needed for tests |
| 204 |
-RESTRICT+=" test" |
| 205 |
- |
| 206 |
-# false positives unless all USE flags are on |
| 207 |
-CMAKE_WARN_UNUSED_CLI="no" |
| 208 |
- |
| 209 |
-STRIP_MASK="/usr/lib*/rados-classes/*" |
| 210 |
- |
| 211 |
-UNBUNDLE_LIBS=( |
| 212 |
- src/erasure-code/jerasure/jerasure |
| 213 |
- src/erasure-code/jerasure/gf-complete |
| 214 |
-) |
| 215 |
- |
| 216 |
-PATCHES=( |
| 217 |
- "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
| 218 |
- "${FILESDIR}/ceph-12.2.0-cflags.patch" |
| 219 |
- "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch" |
| 220 |
- "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" |
| 221 |
- "${FILESDIR}/ceph-12.2.4-cflags.patch" |
| 222 |
- "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" |
| 223 |
- "${FILESDIR}/ceph-12.2.5-no-werror.patch" |
| 224 |
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
| 225 |
- "${FILESDIR}/ceph-12.2.11-fix-min-call.patch" |
| 226 |
-) |
| 227 |
- |
| 228 |
-check-reqs_export_vars() { |
| 229 |
- if use amd64; then |
| 230 |
- CHECKREQS_DISK_BUILD="12G" |
| 231 |
- CHECKREQS_DISK_USR="460M" |
| 232 |
- else |
| 233 |
- CHECKREQS_DISK_BUILD="1400M" |
| 234 |
- CHECKREQS_DISK_USR="450M" |
| 235 |
- fi |
| 236 |
- |
| 237 |
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR |
| 238 |
-} |
| 239 |
- |
| 240 |
-user_setup() { |
| 241 |
- enewgroup ceph ${CEPH_GID} |
| 242 |
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph |
| 243 |
-} |
| 244 |
- |
| 245 |
-pkg_pretend() { |
| 246 |
- check-reqs_export_vars |
| 247 |
- check-reqs_pkg_pretend |
| 248 |
-} |
| 249 |
- |
| 250 |
-pkg_setup() { |
| 251 |
- python_setup 'python2*' |
| 252 |
- check-reqs_export_vars |
| 253 |
- check-reqs_pkg_setup |
| 254 |
- user_setup |
| 255 |
-} |
| 256 |
- |
| 257 |
-src_prepare() { |
| 258 |
- cmake-utils_src_prepare |
| 259 |
- |
| 260 |
- if use system-boost; then |
| 261 |
- eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch" |
| 262 |
- fi |
| 263 |
- |
| 264 |
- # remove tests that need root access |
| 265 |
- rm src/test/cli/ceph-authtool/cap*.t |
| 266 |
- |
| 267 |
- #rm -rf "${UNBUNDLE_LIBS[@]}" |
| 268 |
-} |
| 269 |
- |
| 270 |
-ceph_src_configure() { |
| 271 |
- local flag |
| 272 |
- local mycmakeargs=( |
| 273 |
- -DWITH_BABELTRACE=$(usex babeltrace) |
| 274 |
- -DWITH_CEPHFS=$(usex cephfs) |
| 275 |
- -DWITH_FUSE=$(usex fuse) |
| 276 |
- -DWITH_LTTNG=$(usex lttng) |
| 277 |
- -DWITH_MGR=$(usex mgr) |
| 278 |
- -DWITH_NSS=$(usex nss) |
| 279 |
- -DWITH_OPENLDAP=$(usex ldap) |
| 280 |
- -DWITH_RADOSGW=$(usex radosgw) |
| 281 |
- -DWITH_SSL=$(usex ssl) |
| 282 |
- -DWITH_SYSTEMD=$(usex systemd) |
| 283 |
- -DWITH_TESTS=$(usex test) |
| 284 |
- -DWITH_XFS=$(usex xfs) |
| 285 |
- -DWITH_ZFS=$(usex zfs) |
| 286 |
- -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') |
| 287 |
- -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '') |
| 288 |
- -DWITH_SYSTEM_BOOST=$(usex system-boost) |
| 289 |
- -DBOOST_J=$(makeopts_jobs) |
| 290 |
- -DWITH_RDMA=no |
| 291 |
- -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) |
| 292 |
- -DEPYTHON_VERSION="${EPYTHON#python}" |
| 293 |
- ) |
| 294 |
- if use amd64 || use x86; then |
| 295 |
- for flag in ${CPU_FLAGS_X86[@]}; do |
| 296 |
- mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") |
| 297 |
- done |
| 298 |
- fi |
| 299 |
- |
| 300 |
- rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" |
| 301 |
- cmake-utils_src_configure |
| 302 |
- |
| 303 |
- # bug #630232 |
| 304 |
- sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
| 305 |
- "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ |
| 306 |
- || die "sed failed" |
| 307 |
-} |
| 308 |
- |
| 309 |
-src_configure() { |
| 310 |
- ceph_src_configure |
| 311 |
-} |
| 312 |
- |
| 313 |
-python_compile() { |
| 314 |
- local CMAKE_USE_DIR="${S}" |
| 315 |
- |
| 316 |
- ceph_src_configure |
| 317 |
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
| 318 |
- emake VERBOSE=1 all |
| 319 |
- |
| 320 |
- # python modules are only compiled with "make install" so we need to do this to |
| 321 |
- # prevent doing a bunch of compilation in src_install |
| 322 |
- DESTDIR="${T}" emake VERBOSE=1 install |
| 323 |
- popd >/dev/null || die |
| 324 |
-} |
| 325 |
- |
| 326 |
-src_compile() { |
| 327 |
- cmake-utils_src_make all |
| 328 |
- |
| 329 |
- # we have to do this here to prevent from building everything multiple times |
| 330 |
- BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources |
| 331 |
- python_foreach_impl python_compile |
| 332 |
-} |
| 333 |
- |
| 334 |
-src_test() { |
| 335 |
- make check || die "make check failed" |
| 336 |
-} |
| 337 |
- |
| 338 |
-python_install() { |
| 339 |
- local CMAKE_USE_DIR="${S}" |
| 340 |
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
| 341 |
- DESTDIR="${D}" emake install |
| 342 |
- popd >/dev/null || die |
| 343 |
-} |
| 344 |
- |
| 345 |
-src_install() { |
| 346 |
- cmake-utils_src_install |
| 347 |
- python_foreach_impl python_install |
| 348 |
- |
| 349 |
- prune_libtool_files --all |
| 350 |
- |
| 351 |
- exeinto /usr/$(get_libdir)/ceph |
| 352 |
- newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh |
| 353 |
- |
| 354 |
- insinto /etc/logrotate.d/ |
| 355 |
- newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
| 356 |
- |
| 357 |
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
| 358 |
- |
| 359 |
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph |
| 360 |
- |
| 361 |
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap |
| 362 |
- newinitd "${FILESDIR}/${PN}.initd-r11" ${PN} |
| 363 |
- newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
| 364 |
- |
| 365 |
- insinto /etc/sysctl.d |
| 366 |
- newins "${FILESDIR}"/sysctld 90-${PN}.conf |
| 367 |
- |
| 368 |
- use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc |
| 369 |
- |
| 370 |
- # units aren't installed by the build system unless systemd is enabled |
| 371 |
- # so no point installing these with the USE flag disabled |
| 372 |
- if use systemd; then |
| 373 |
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ |
| 374 |
- "ceph-mds@.service" |
| 375 |
- |
| 376 |
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ |
| 377 |
- "ceph-osd@.service" |
| 378 |
- fi |
| 379 |
- |
| 380 |
- udev_dorules udev/*.rules |
| 381 |
- |
| 382 |
- readme.gentoo_create_doc |
| 383 |
- |
| 384 |
- python_setup 'python2*' |
| 385 |
- |
| 386 |
- # bug #630232 |
| 387 |
- sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ |
| 388 |
- || die "sed failed" |
| 389 |
- |
| 390 |
- python_fix_shebang "${ED}"/usr/{,s}bin/ |
| 391 |
- |
| 392 |
- # python_fix_shebang apparently is not idempotent |
| 393 |
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ |
| 394 |
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" |
| 395 |
-} |
| 396 |
- |
| 397 |
-pkg_postinst() { |
| 398 |
- readme.gentoo_print_elog |
| 399 |
-} |
| 400 |
|
| 401 |
diff --git a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild |
| 402 |
deleted file mode 100644 |
| 403 |
index 79f077e..0000000 |
| 404 |
--- a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild |
| 405 |
+++ /dev/null |
| 406 |
@@ -1,327 +0,0 @@ |
| 407 |
-# Copyright 1999-2019 Gentoo Authors |
| 408 |
-# Distributed under the terms of the GNU General Public License v2 |
| 409 |
- |
| 410 |
-EAPI=7 |
| 411 |
-PYTHON_COMPAT=( python{2_7,3_{5,6}} ) |
| 412 |
-DISTUTILS_OPTIONAL=1 |
| 413 |
- |
| 414 |
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ |
| 415 |
- python-r1 udev user readme.gentoo-r1 systemd |
| 416 |
- |
| 417 |
-if [[ ${PV} == *9999* ]]; then |
| 418 |
- inherit git-r3 |
| 419 |
- EGIT_REPO_URI="https://github.com/ceph/ceph.git" |
| 420 |
- SRC_URI="" |
| 421 |
-else |
| 422 |
- SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" |
| 423 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
| 424 |
-fi |
| 425 |
- |
| 426 |
-DESCRIPTION="Ceph distributed filesystem" |
| 427 |
-HOMEPAGE="https://ceph.com/" |
| 428 |
- |
| 429 |
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT" |
| 430 |
-SLOT="0" |
| 431 |
- |
| 432 |
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) |
| 433 |
- |
| 434 |
-IUSE="babeltrace cephfs fuse jemalloc ldap libressl lttng +mgr nss +radosgw +ssl" |
| 435 |
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" |
| 436 |
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" |
| 437 |
- |
| 438 |
-# unbundling code commented out pending bugs 584056 and 584058 |
| 439 |
-#>=dev-libs/jerasure-2.0.0-r1 |
| 440 |
-#>=dev-libs/gf-complete-2.0.0 |
| 441 |
-COMMON_DEPEND=" |
| 442 |
- virtual/libudev:= |
| 443 |
- app-arch/bzip2:=[static-libs?] |
| 444 |
- app-arch/lz4:=[static-libs?] |
| 445 |
- app-arch/snappy:=[static-libs?] |
| 446 |
- app-arch/zstd:=[static-libs?] |
| 447 |
- app-misc/jq:=[static-libs?] |
| 448 |
- <dev-libs/crypto++-7.0:=[static-libs?] |
| 449 |
- dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] |
| 450 |
- dev-libs/libaio:=[static-libs?] |
| 451 |
- dev-libs/libxml2:=[static-libs?] |
| 452 |
- sys-apps/keyutils:=[static-libs?] |
| 453 |
- sys-apps/util-linux:=[static-libs?] |
| 454 |
- sys-libs/zlib:=[static-libs?] |
| 455 |
- babeltrace? ( dev-util/babeltrace ) |
| 456 |
- ldap? ( net-nds/openldap:=[static-libs?] ) |
| 457 |
- lttng? ( dev-util/lttng-ust:= ) |
| 458 |
- nss? ( dev-libs/nss:= ) |
| 459 |
- fuse? ( sys-fs/fuse:0=[static-libs?] ) |
| 460 |
- xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 461 |
- zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 462 |
- ssl? ( |
| 463 |
- !libressl? ( dev-libs/openssl:0=[static-libs?] ) |
| 464 |
- libressl? ( <dev-libs/libressl-2.8 ) |
| 465 |
- ) |
| 466 |
- radosgw? ( |
| 467 |
- dev-libs/expat:=[static-libs?] |
| 468 |
- !libressl? ( |
| 469 |
- <dev-libs/openssl-1.1:=[static-libs?] |
| 470 |
- net-misc/curl:=[curl_ssl_openssl,static-libs?] |
| 471 |
- ) |
| 472 |
- libressl? ( |
| 473 |
- <dev-libs/libressl-2.8:=[static-libs?] |
| 474 |
- net-misc/curl:=[curl_ssl_libressl,static-libs?] |
| 475 |
- ) |
| 476 |
- net-misc/curl:=[curl_ssl_openssl,static-libs?] |
| 477 |
- ) |
| 478 |
- system-boost? ( |
| 479 |
- =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] |
| 480 |
- ) |
| 481 |
- jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) |
| 482 |
- !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) |
| 483 |
- ${PYTHON_DEPS} |
| 484 |
- " |
| 485 |
-DEPEND="${COMMON_DEPEND} |
| 486 |
- app-arch/cpio |
| 487 |
- amd64? ( dev-lang/yasm ) |
| 488 |
- x86? ( dev-lang/yasm ) |
| 489 |
- dev-python/cython[${PYTHON_USEDEP}] |
| 490 |
- dev-python/sphinx |
| 491 |
- dev-util/gperf |
| 492 |
- dev-util/valgrind |
| 493 |
- sys-apps/which |
| 494 |
- sys-devel/bc |
| 495 |
- virtual/pkgconfig |
| 496 |
- test? ( |
| 497 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
| 498 |
- sys-apps/grep[pcre] |
| 499 |
- sys-fs/btrfs-progs |
| 500 |
- )" |
| 501 |
-RDEPEND="${COMMON_DEPEND} |
| 502 |
- net-misc/socat |
| 503 |
- sys-apps/gptfdisk |
| 504 |
- sys-block/parted |
| 505 |
- sys-fs/e2fsprogs |
| 506 |
- sys-fs/cryptsetup |
| 507 |
- sys-fs/lvm2 |
| 508 |
- !<sys-apps/openrc-0.26.3 |
| 509 |
- dev-python/cherrypy[${PYTHON_USEDEP}] |
| 510 |
- dev-python/flask[${PYTHON_USEDEP}] |
| 511 |
- dev-python/jinja[${PYTHON_USEDEP}] |
| 512 |
- dev-python/pecan[${PYTHON_USEDEP}] |
| 513 |
- dev-python/prettytable[${PYTHON_USEDEP}] |
| 514 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 515 |
- dev-python/requests[${PYTHON_USEDEP}] |
| 516 |
- dev-python/werkzeug[${PYTHON_USEDEP}] |
| 517 |
- " |
| 518 |
-REQUIRED_USE=" |
| 519 |
- $(python_gen_useflags 'python2*') |
| 520 |
- ${PYTHON_REQUIRED_USE} |
| 521 |
- ?? ( ssl nss ) |
| 522 |
- ?? ( jemalloc tcmalloc ) |
| 523 |
- " |
| 524 |
- |
| 525 |
-RESTRICT="test? ( userpriv )" |
| 526 |
- |
| 527 |
-# distribution tarball does not include everything needed for tests |
| 528 |
-RESTRICT+=" test" |
| 529 |
- |
| 530 |
-# false positives unless all USE flags are on |
| 531 |
-CMAKE_WARN_UNUSED_CLI="no" |
| 532 |
- |
| 533 |
-# ninja does not work at all |
| 534 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 535 |
- |
| 536 |
-UNBUNDLE_LIBS=( |
| 537 |
- src/erasure-code/jerasure/jerasure |
| 538 |
- src/erasure-code/jerasure/gf-complete |
| 539 |
-) |
| 540 |
- |
| 541 |
-PATCHES=( |
| 542 |
- "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
| 543 |
- "${FILESDIR}/ceph-12.2.0-cflags.patch" |
| 544 |
- "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch" |
| 545 |
- "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" |
| 546 |
- "${FILESDIR}/ceph-12.2.4-cflags.patch" |
| 547 |
- "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" |
| 548 |
- "${FILESDIR}/ceph-12.2.5-no-werror.patch" |
| 549 |
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
| 550 |
- "${FILESDIR}/ceph-12.2.11-fix-min-call.patch" |
| 551 |
- "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch" |
| 552 |
- "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch" |
| 553 |
- "${FILESDIR}/ceph-12.2.12-qa-warning.patch" |
| 554 |
- "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" |
| 555 |
-) |
| 556 |
- |
| 557 |
-check-reqs_export_vars() { |
| 558 |
- if use amd64; then |
| 559 |
- CHECKREQS_DISK_BUILD="12G" |
| 560 |
- CHECKREQS_DISK_USR="460M" |
| 561 |
- else |
| 562 |
- CHECKREQS_DISK_BUILD="1400M" |
| 563 |
- CHECKREQS_DISK_USR="450M" |
| 564 |
- fi |
| 565 |
- |
| 566 |
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR |
| 567 |
-} |
| 568 |
- |
| 569 |
-user_setup() { |
| 570 |
- enewgroup ceph ${CEPH_GID} |
| 571 |
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph |
| 572 |
-} |
| 573 |
- |
| 574 |
-pkg_pretend() { |
| 575 |
- check-reqs_export_vars |
| 576 |
- check-reqs_pkg_pretend |
| 577 |
-} |
| 578 |
- |
| 579 |
-pkg_setup() { |
| 580 |
- python_setup 'python2*' |
| 581 |
- check-reqs_export_vars |
| 582 |
- check-reqs_pkg_setup |
| 583 |
- user_setup |
| 584 |
-} |
| 585 |
- |
| 586 |
-src_prepare() { |
| 587 |
- cmake-utils_src_prepare |
| 588 |
- |
| 589 |
- if use system-boost; then |
| 590 |
- eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch" |
| 591 |
- fi |
| 592 |
- |
| 593 |
- # remove tests that need root access |
| 594 |
- rm src/test/cli/ceph-authtool/cap*.t |
| 595 |
- |
| 596 |
- #rm -rf "${UNBUNDLE_LIBS[@]}" |
| 597 |
-} |
| 598 |
- |
| 599 |
-ceph_src_configure() { |
| 600 |
- local flag |
| 601 |
- local mycmakeargs=( |
| 602 |
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" |
| 603 |
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
| 604 |
- -DWITH_BABELTRACE=$(usex babeltrace) |
| 605 |
- -DWITH_CEPHFS=$(usex cephfs) |
| 606 |
- -DWITH_FUSE=$(usex fuse) |
| 607 |
- -DWITH_LTTNG=$(usex lttng) |
| 608 |
- -DWITH_MGR=$(usex mgr) |
| 609 |
- -DWITH_NSS=$(usex nss) |
| 610 |
- -DWITH_OPENLDAP=$(usex ldap) |
| 611 |
- -DWITH_RADOSGW=$(usex radosgw) |
| 612 |
- -DWITH_SSL=$(usex ssl) |
| 613 |
- -DWITH_SYSTEMD=$(usex systemd) |
| 614 |
- -DWITH_TESTS=$(usex test) |
| 615 |
- -DWITH_XFS=$(usex xfs) |
| 616 |
- -DWITH_ZFS=$(usex zfs) |
| 617 |
- -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') |
| 618 |
- -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") |
| 619 |
- -DWITH_SYSTEM_BOOST=$(usex system-boost) |
| 620 |
- -DBOOST_J=$(makeopts_jobs) |
| 621 |
- -DWITH_RDMA=no |
| 622 |
- -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) |
| 623 |
- -DEPYTHON_VERSION="${EPYTHON#python}" |
| 624 |
- ) |
| 625 |
- if use amd64 || use x86; then |
| 626 |
- for flag in ${CPU_FLAGS_X86[@]}; do |
| 627 |
- mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") |
| 628 |
- done |
| 629 |
- fi |
| 630 |
- |
| 631 |
- rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" |
| 632 |
- cmake-utils_src_configure |
| 633 |
- |
| 634 |
- # bug #630232 |
| 635 |
- sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
| 636 |
- "${BUILD_DIR:--${S}}"/include/acconfig.h \ |
| 637 |
- || die "sed failed" |
| 638 |
-} |
| 639 |
- |
| 640 |
-src_configure() { |
| 641 |
- ceph_src_configure |
| 642 |
-} |
| 643 |
- |
| 644 |
-python_compile() { |
| 645 |
- local CMAKE_USE_DIR="${S}" |
| 646 |
- |
| 647 |
- ceph_src_configure |
| 648 |
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
| 649 |
- emake VERBOSE=1 all |
| 650 |
- |
| 651 |
- # python modules are only compiled with "make install" so we need to do this to |
| 652 |
- # prevent doing a bunch of compilation in src_install |
| 653 |
- DESTDIR="${T}" emake VERBOSE=1 install |
| 654 |
- popd >/dev/null || die |
| 655 |
-} |
| 656 |
- |
| 657 |
-src_compile() { |
| 658 |
- cmake-utils_src_make all |
| 659 |
- |
| 660 |
- # we have to do this here to prevent from building everything multiple times |
| 661 |
- python_copy_sources |
| 662 |
- python_foreach_impl python_compile |
| 663 |
-} |
| 664 |
- |
| 665 |
-src_test() { |
| 666 |
- make check || die "make check failed" |
| 667 |
-} |
| 668 |
- |
| 669 |
-python_install() { |
| 670 |
- local CMAKE_USE_DIR="${S}" |
| 671 |
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die |
| 672 |
- DESTDIR="${ED}" emake install |
| 673 |
- popd >/dev/null || die |
| 674 |
-} |
| 675 |
- |
| 676 |
-src_install() { |
| 677 |
- cmake-utils_src_install |
| 678 |
- python_foreach_impl python_install |
| 679 |
- |
| 680 |
- find "${D}" -name '*.la' -delete || die |
| 681 |
- |
| 682 |
- exeinto /usr/$(get_libdir)/ceph |
| 683 |
- newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh |
| 684 |
- |
| 685 |
- insinto /etc/logrotate.d/ |
| 686 |
- newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} |
| 687 |
- |
| 688 |
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
| 689 |
- |
| 690 |
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph |
| 691 |
- |
| 692 |
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap |
| 693 |
- newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} |
| 694 |
- newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} |
| 695 |
- |
| 696 |
- insinto /etc/sysctl.d |
| 697 |
- newins "${FILESDIR}"/sysctld 90-${PN}.conf |
| 698 |
- |
| 699 |
- use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc |
| 700 |
- |
| 701 |
- # units aren't installed by the build system unless systemd is enabled |
| 702 |
- # so no point installing these with the USE flag disabled |
| 703 |
- if use systemd; then |
| 704 |
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ |
| 705 |
- "ceph-mds@.service" |
| 706 |
- |
| 707 |
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ |
| 708 |
- "ceph-osd@.service" |
| 709 |
- fi |
| 710 |
- |
| 711 |
- udev_dorules udev/*.rules |
| 712 |
- |
| 713 |
- readme.gentoo_create_doc |
| 714 |
- |
| 715 |
- python_setup 'python2*' |
| 716 |
- |
| 717 |
- # bug #630232 |
| 718 |
- sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ |
| 719 |
- || die "sed failed" |
| 720 |
- |
| 721 |
- python_fix_shebang "${ED}"/usr/{,s}bin/ |
| 722 |
- |
| 723 |
- # python_fix_shebang apparently is not idempotent |
| 724 |
- sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ |
| 725 |
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" |
| 726 |
- |
| 727 |
- local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) |
| 728 |
- dostrip -x "${rados_classes[@]#${D}}" |
| 729 |
-} |
| 730 |
- |
| 731 |
-pkg_postinst() { |
| 732 |
- readme.gentoo_print_elog |
| 733 |
-} |
| 734 |
|
| 735 |
diff --git a/sys-cluster/ceph/files/README.gentoo b/sys-cluster/ceph/files/README.gentoo |
| 736 |
deleted file mode 100644 |
| 737 |
index 6e5f836..0000000 |
| 738 |
--- a/sys-cluster/ceph/files/README.gentoo |
| 739 |
+++ /dev/null |
| 740 |
@@ -1,30 +0,0 @@ |
| 741 |
-1) We'd suggest you to install following packages |
| 742 |
- sys-block/parted to manage disk partions |
| 743 |
- sys-fs/btrfs-progs to use btrfs filesytem |
| 744 |
- sys-fs/cryptsetup to use encrypted devices with dm-crypt |
| 745 |
- |
| 746 |
-2) To start several daemons of one specific type, create your own scripts |
| 747 |
- cd /etc/init.d |
| 748 |
- for dmn in mds.a mon.a osd.0 osd.1 osd.2; do |
| 749 |
- ln -s ceph ceph-${dmn}; |
| 750 |
- rc-update add ceph-${dmn} default; |
| 751 |
- done |
| 752 |
- |
| 753 |
-3) If you spread ceph daemons over several different machines, |
| 754 |
- We'd highly recommend you to start ntp-client to keep the system time sync. |
| 755 |
- Try to choose one of following ntp client to install and add into runlevel. |
| 756 |
- net-misc/ntp |
| 757 |
- net-misc/openntpd |
| 758 |
- net-misc/chrony |
| 759 |
- |
| 760 |
-4) Starting from version 9.0.x, Ceph daemons run as user 'ceph' instead of 'root'. |
| 761 |
- In order to solve this, we recommand to stop ceph daemons, and fix the ownership |
| 762 |
- |
| 763 |
- # chown -R ceph:ceph /var/lib/ceph |
| 764 |
- |
| 765 |
- or |
| 766 |
- |
| 767 |
- Add the following line to ceph.conf on all hosts: |
| 768 |
- " setuser match path = /var/lib/ceph/$type/$cluster-$id " |
| 769 |
- |
| 770 |
- https://ceph.com/releases/v9-2-0-infernalis-released/ |
| 771 |
|
| 772 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch b/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch |
| 773 |
deleted file mode 100644 |
| 774 |
index f362763..0000000 |
| 775 |
--- a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch |
| 776 |
+++ /dev/null |
| 777 |
@@ -1,95 +0,0 @@ |
| 778 |
-diff --git a/Makefile.am b/Makefile.am |
| 779 |
-index 7734be2..ba33bda 100644 |
| 780 |
---- a/Makefile.am |
| 781 |
-+++ b/Makefile.am |
| 782 |
-@@ -79,7 +79,6 @@ clean-local: |
| 783 |
- cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
| 784 |
- fi |
| 785 |
- |
| 786 |
-- @rm -rf src/test/virtualenv |
| 787 |
- @rm -rf install-deps-* |
| 788 |
- |
| 789 |
- |
| 790 |
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am |
| 791 |
-index df225d6..ca030cf 100644 |
| 792 |
---- a/src/Makefile-env.am |
| 793 |
-+++ b/src/Makefile-env.am |
| 794 |
-@@ -297,10 +297,6 @@ LIBCIVETWEB_DEPS = |
| 795 |
- DENCODER_SOURCES = |
| 796 |
- DENCODER_DEPS = |
| 797 |
- |
| 798 |
--# put virtualenvs in this directory |
| 799 |
--# otherwise it may overflow #! 80 kernel limit |
| 800 |
--# beware that some build environments might not be able to write to /tmp |
| 801 |
- export TMPDIR ?= /tmp |
| 802 |
--export CEPH_BUILD_VIRTUALENV = $(TMPDIR) |
| 803 |
- |
| 804 |
- radoslibdir = $(libdir)/rados-classes |
| 805 |
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am |
| 806 |
-index 8ddcb1e..52dd5d5 100644 |
| 807 |
---- a/src/ceph-detect-init/Makefile.am |
| 808 |
-+++ b/src/ceph-detect-init/Makefile.am |
| 809 |
-@@ -53,15 +53,10 @@ EXTRA_DIST += \ |
| 810 |
- ceph-detect-init/tests/test_all.py \ |
| 811 |
- ceph-detect-init/tox.ini |
| 812 |
- |
| 813 |
--export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv |
| 814 |
-- |
| 815 |
--ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV} |
| 816 |
-- |
| 817 |
--${CEPH_DETECT_INIT_VIRTUALENV}: |
| 818 |
-- cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . |
| 819 |
-+ceph-detect-init-all: |
| 820 |
- |
| 821 |
- ceph-detect-init-clean: |
| 822 |
-- cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info |
| 823 |
-+ cd $(srcdir)/ceph-detect-init |
| 824 |
- |
| 825 |
- ceph-detect-init-install-data: |
| 826 |
- cd $(srcdir)/ceph-detect-init ; \ |
| 827 |
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am |
| 828 |
-index 9006303..0b35b0f 100644 |
| 829 |
---- a/src/ceph-disk/Makefile.am |
| 830 |
-+++ b/src/ceph-disk/Makefile.am |
| 831 |
-@@ -29,15 +29,10 @@ EXTRA_DIST += \ |
| 832 |
- ceph-disk/tests/test_main.py \ |
| 833 |
- ceph-disk/tox.ini |
| 834 |
- |
| 835 |
--export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv |
| 836 |
-- |
| 837 |
--ceph-disk-all: ${CEPH_DISK_VIRTUALENV} |
| 838 |
-- |
| 839 |
--${CEPH_DISK_VIRTUALENV}: |
| 840 |
-- cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . |
| 841 |
-+ceph-disk-all: |
| 842 |
- |
| 843 |
- ceph-disk-clean: |
| 844 |
-- cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info |
| 845 |
-+ cd $(srcdir)/ceph-disk |
| 846 |
- |
| 847 |
- ceph-disk-install-data: |
| 848 |
- cd $(srcdir)/ceph-disk ; \ |
| 849 |
-diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am |
| 850 |
-index e730850..9569947 100644 |
| 851 |
---- a/src/tools/Makefile.am |
| 852 |
-+++ b/src/tools/Makefile.am |
| 853 |
-@@ -45,6 +45,3 @@ noinst_HEADERS += \ |
| 854 |
- tools/rados/PoolDump.h \ |
| 855 |
- tools/cephfs/DataScan.h \ |
| 856 |
- tools/cephfs/RoleSelector.h |
| 857 |
-- |
| 858 |
--EXTRA_DIST += \ |
| 859 |
-- tools/setup-virtualenv.sh |
| 860 |
-diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh |
| 861 |
-index 9ff2d26..b6fca0a 100755 |
| 862 |
---- a/src/tools/setup-virtualenv.sh |
| 863 |
-+++ b/src/tools/setup-virtualenv.sh |
| 864 |
-@@ -15,6 +15,8 @@ |
| 865 |
- # GNU Library Public License for more details. |
| 866 |
- # |
| 867 |
- |
| 868 |
-+exit 0 |
| 869 |
-+ |
| 870 |
- DIR=$1 |
| 871 |
- rm -fr $DIR |
| 872 |
- mkdir -p $DIR |
| 873 |
|
| 874 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch b/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch |
| 875 |
deleted file mode 100644 |
| 876 |
index 34f8eb8..0000000 |
| 877 |
--- a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch |
| 878 |
+++ /dev/null |
| 879 |
@@ -1,11 +0,0 @@ |
| 880 |
---- ceph-10.2.1/configure.ac |
| 881 |
-+++ ceph-10.2.1/configure.ac |
| 882 |
-@@ -908,7 +908,7 @@ |
| 883 |
- , |
| 884 |
- [with_libzfs=no]) |
| 885 |
- AS_IF([test "x$with_libzfs" = xyes], |
| 886 |
-- [PKG_CHECK_MODULES([LIBZFS], [zfs], [], [true])]) |
| 887 |
-+ [PKG_CHECK_MODULES([LIBZFS], [libzfs], [], [true])]) |
| 888 |
- AS_IF([test "x$with_libzfs" = xyes], |
| 889 |
- [AC_DEFINE([HAVE_LIBZFS], [1], [Defined if you have libzfs enabled])]) |
| 890 |
- AM_CONDITIONAL(WITH_LIBZFS, [ test "$with_libzfs" = "yes" ]) |
| 891 |
|
| 892 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch |
| 893 |
deleted file mode 100644 |
| 894 |
index 8340b4d..0000000 |
| 895 |
--- a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch |
| 896 |
+++ /dev/null |
| 897 |
@@ -1,355 +0,0 @@ |
| 898 |
-diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am |
| 899 |
-index adcb95d..8099208 100644 |
| 900 |
---- a/src/erasure-code/jerasure/Makefile.am |
| 901 |
-+++ b/src/erasure-code/jerasure/Makefile.am |
| 902 |
-@@ -1,52 +1,17 @@ |
| 903 |
- # jerasure plugin |
| 904 |
- noinst_HEADERS += \ |
| 905 |
-- erasure-code/jerasure/gf-complete/include/gf_complete.h \ |
| 906 |
-- erasure-code/jerasure/gf-complete/include/gf_general.h \ |
| 907 |
-- erasure-code/jerasure/gf-complete/include/gf_int.h \ |
| 908 |
-- erasure-code/jerasure/gf-complete/include/gf_method.h \ |
| 909 |
-- erasure-code/jerasure/gf-complete/include/gf_rand.h \ |
| 910 |
-- erasure-code/jerasure/gf-complete/include/gf_w16.h \ |
| 911 |
-- erasure-code/jerasure/gf-complete/include/gf_w32.h \ |
| 912 |
-- erasure-code/jerasure/gf-complete/include/gf_w4.h \ |
| 913 |
-- erasure-code/jerasure/gf-complete/include/gf_w64.h \ |
| 914 |
-- erasure-code/jerasure/gf-complete/include/gf_w8.h \ |
| 915 |
-- erasure-code/jerasure/jerasure/include/cauchy.h \ |
| 916 |
-- erasure-code/jerasure/jerasure/include/galois.h \ |
| 917 |
-- erasure-code/jerasure/jerasure/include/jerasure.h \ |
| 918 |
-- erasure-code/jerasure/jerasure/include/liberation.h \ |
| 919 |
-- erasure-code/jerasure/jerasure/include/reed_sol.h \ |
| 920 |
- erasure-code/jerasure/ErasureCodeJerasure.h |
| 921 |
- |
| 922 |
- jerasure_sources = \ |
| 923 |
- erasure-code/ErasureCode.cc \ |
| 924 |
-- erasure-code/jerasure/jerasure/src/cauchy.c \ |
| 925 |
-- erasure-code/jerasure/jerasure/src/galois.c \ |
| 926 |
-- erasure-code/jerasure/jerasure/src/jerasure.c \ |
| 927 |
-- erasure-code/jerasure/jerasure/src/liberation.c \ |
| 928 |
-- erasure-code/jerasure/jerasure/src/reed_sol.c \ |
| 929 |
-- erasure-code/jerasure/gf-complete/src/gf_wgen.c \ |
| 930 |
-- erasure-code/jerasure/gf-complete/src/gf_method.c \ |
| 931 |
-- erasure-code/jerasure/gf-complete/src/gf_w16.c \ |
| 932 |
-- erasure-code/jerasure/gf-complete/src/gf.c \ |
| 933 |
-- erasure-code/jerasure/gf-complete/src/gf_w32.c \ |
| 934 |
-- erasure-code/jerasure/gf-complete/src/gf_w64.c \ |
| 935 |
-- erasure-code/jerasure/gf-complete/src/gf_w128.c \ |
| 936 |
-- erasure-code/jerasure/gf-complete/src/gf_general.c \ |
| 937 |
-- erasure-code/jerasure/gf-complete/src/gf_w4.c \ |
| 938 |
-- erasure-code/jerasure/gf-complete/src/gf_rand.c \ |
| 939 |
-- erasure-code/jerasure/gf-complete/src/gf_w8.c \ |
| 940 |
- erasure-code/jerasure/ErasureCodePluginJerasure.cc \ |
| 941 |
- erasure-code/jerasure/ErasureCodeJerasure.cc |
| 942 |
- |
| 943 |
- erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h |
| 944 |
- |
| 945 |
- libec_jerasure_generic_la_SOURCES = ${jerasure_sources} |
| 946 |
--libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \ |
| 947 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 948 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 949 |
--libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 950 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 951 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 952 |
-+libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} |
| 953 |
-+libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} |
| 954 |
- libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 955 |
- libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
| 956 |
- if LINUX |
| 957 |
-@@ -55,20 +20,11 @@ endif |
| 958 |
- |
| 959 |
- erasure_codelib_LTLIBRARIES += libec_jerasure_generic.la |
| 960 |
- |
| 961 |
--libec_jerasure_neon_la_SOURCES = ${jerasure_sources} \ |
| 962 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \ |
| 963 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \ |
| 964 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \ |
| 965 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \ |
| 966 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c |
| 967 |
-+libec_jerasure_neon_la_SOURCES = ${jerasure_sources} |
| 968 |
- libec_jerasure_neon_la_CFLAGS = ${AM_CFLAGS} \ |
| 969 |
-- ${ARM_NEON_FLAGS} \ |
| 970 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 971 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 972 |
-+ ${ARM_NEON_FLAGS} |
| 973 |
- libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 974 |
-- ${ARM_NEON_FLAGS} \ |
| 975 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 976 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 977 |
-+ ${ARM_NEON_FLAGS} |
| 978 |
- libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 979 |
- libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
| 980 |
- if LINUX |
| 981 |
-@@ -84,16 +40,12 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \ |
| 982 |
- ${INTEL_SSE_FLAGS} \ |
| 983 |
- ${INTEL_SSE2_FLAGS} \ |
| 984 |
- ${INTEL_SSE3_FLAGS} \ |
| 985 |
-- ${INTEL_SSSE3_FLAGS} \ |
| 986 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 987 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 988 |
-+ ${INTEL_SSSE3_FLAGS} |
| 989 |
- libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 990 |
- ${INTEL_SSE_FLAGS} \ |
| 991 |
- ${INTEL_SSE2_FLAGS} \ |
| 992 |
- ${INTEL_SSE3_FLAGS} \ |
| 993 |
-- ${INTEL_SSSE3_FLAGS} \ |
| 994 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 995 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 996 |
-+ ${INTEL_SSSE3_FLAGS} |
| 997 |
- libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 998 |
- libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
| 999 |
- if LINUX |
| 1000 |
-@@ -111,18 +63,14 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS} \ |
| 1001 |
- ${INTEL_SSE3_FLAGS} \ |
| 1002 |
- ${INTEL_SSSE3_FLAGS} \ |
| 1003 |
- ${INTEL_SSE4_1_FLAGS} \ |
| 1004 |
-- ${INTEL_SSE4_2_FLAGS} \ |
| 1005 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1006 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 1007 |
-+ ${INTEL_SSE4_2_FLAGS} |
| 1008 |
- libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 1009 |
- ${INTEL_SSE_FLAGS} \ |
| 1010 |
- ${INTEL_SSE2_FLAGS} \ |
| 1011 |
- ${INTEL_SSE3_FLAGS} \ |
| 1012 |
- ${INTEL_SSSE3_FLAGS} \ |
| 1013 |
- ${INTEL_SSE4_1_FLAGS} \ |
| 1014 |
-- ${INTEL_SSE4_2_FLAGS} \ |
| 1015 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1016 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
| 1017 |
-+ ${INTEL_SSE4_2_FLAGS} |
| 1018 |
- libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 1019 |
- libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
| 1020 |
- if LINUX |
| 1021 |
-diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc |
| 1022 |
-index d2b72f5..acbd172 100644 |
| 1023 |
---- a/src/erasure-code/shec/ErasureCodePluginShec.cc |
| 1024 |
-+++ b/src/erasure-code/shec/ErasureCodePluginShec.cc |
| 1025 |
-@@ -71,7 +71,7 @@ public: |
| 1026 |
- }; |
| 1027 |
- |
| 1028 |
- extern "C" { |
| 1029 |
--#include "jerasure/include/galois.h" |
| 1030 |
-+#include "galois.h" |
| 1031 |
- |
| 1032 |
- extern gf_t *gfp_array[]; |
| 1033 |
- extern int gfp_is_composite[]; |
| 1034 |
-diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc |
| 1035 |
-index 2180328..c84ffc7 100644 |
| 1036 |
---- a/src/erasure-code/shec/ErasureCodeShec.cc |
| 1037 |
-+++ b/src/erasure-code/shec/ErasureCodeShec.cc |
| 1038 |
-@@ -28,8 +28,8 @@ |
| 1039 |
- #include "crush/CrushWrapper.h" |
| 1040 |
- #include "osd/osd_types.h" |
| 1041 |
- extern "C" { |
| 1042 |
--#include "jerasure/include/jerasure.h" |
| 1043 |
--#include "jerasure/include/galois.h" |
| 1044 |
-+#include "jerasure.h" |
| 1045 |
-+#include "galois.h" |
| 1046 |
- |
| 1047 |
- extern int calc_determinant(int *matrix, int dim); |
| 1048 |
- extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w); |
| 1049 |
-diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am |
| 1050 |
-index 6b658d5..3281c60 100644 |
| 1051 |
---- a/src/erasure-code/shec/Makefile.am |
| 1052 |
-+++ b/src/erasure-code/shec/Makefile.am |
| 1053 |
-@@ -4,49 +4,19 @@ shec_sources = \ |
| 1054 |
- erasure-code/shec/ErasureCodePluginShec.cc \ |
| 1055 |
- erasure-code/shec/ErasureCodeShec.cc \ |
| 1056 |
- erasure-code/shec/ErasureCodeShecTableCache.cc \ |
| 1057 |
-- erasure-code/shec/determinant.c \ |
| 1058 |
-- erasure-code/jerasure/jerasure/src/cauchy.c \ |
| 1059 |
-- erasure-code/jerasure/jerasure/src/galois.c \ |
| 1060 |
-- erasure-code/jerasure/jerasure/src/jerasure.c \ |
| 1061 |
-- erasure-code/jerasure/jerasure/src/liberation.c \ |
| 1062 |
-- erasure-code/jerasure/jerasure/src/reed_sol.c \ |
| 1063 |
-- erasure-code/jerasure/gf-complete/src/gf_wgen.c \ |
| 1064 |
-- erasure-code/jerasure/gf-complete/src/gf_method.c \ |
| 1065 |
-- erasure-code/jerasure/gf-complete/src/gf_w16.c \ |
| 1066 |
-- erasure-code/jerasure/gf-complete/src/gf.c \ |
| 1067 |
-- erasure-code/jerasure/gf-complete/src/gf_w32.c \ |
| 1068 |
-- erasure-code/jerasure/gf-complete/src/gf_w64.c \ |
| 1069 |
-- erasure-code/jerasure/gf-complete/src/gf_w128.c \ |
| 1070 |
-- erasure-code/jerasure/gf-complete/src/gf_general.c \ |
| 1071 |
-- erasure-code/jerasure/gf-complete/src/gf_w4.c \ |
| 1072 |
-- erasure-code/jerasure/gf-complete/src/gf_rand.c \ |
| 1073 |
-- erasure-code/jerasure/gf-complete/src/gf_w8.c |
| 1074 |
-+ erasure-code/shec/determinant.c |
| 1075 |
- |
| 1076 |
- noinst_HEADERS += \ |
| 1077 |
- erasure-code/shec/ErasureCodeShec.h \ |
| 1078 |
-- erasure-code/shec/ErasureCodeShecTableCache.h \ |
| 1079 |
-- erasure-code/jerasure/jerasure/include/cauchy.h \ |
| 1080 |
-- erasure-code/jerasure/jerasure/include/galois.h \ |
| 1081 |
-- erasure-code/jerasure/jerasure/include/jerasure.h \ |
| 1082 |
-- erasure-code/jerasure/jerasure/include/liberation.h \ |
| 1083 |
-- erasure-code/jerasure/jerasure/include/reed_sol.h \ |
| 1084 |
-- erasure-code/jerasure/gf-complete/include/gf_int.h \ |
| 1085 |
-- erasure-code/jerasure/gf-complete/include/gf_complete.h \ |
| 1086 |
-- erasure-code/jerasure/gf-complete/include/gf_rand.h \ |
| 1087 |
-- erasure-code/jerasure/gf-complete/include/gf_method.h \ |
| 1088 |
-- erasure-code/jerasure/gf-complete/include/gf_general.h |
| 1089 |
-+ erasure-code/shec/ErasureCodeShecTableCache.h |
| 1090 |
- |
| 1091 |
- erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h |
| 1092 |
- |
| 1093 |
- libec_shec_generic_la_SOURCES = ${shec_sources} |
| 1094 |
- libec_shec_generic_la_CFLAGS = ${AM_CFLAGS} \ |
| 1095 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1096 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1097 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1098 |
- -I$(srcdir)/erasure-code/shec |
| 1099 |
- libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 1100 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1101 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1102 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1103 |
- -I$(srcdir)/erasure-code/shec |
| 1104 |
- libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 1105 |
-@@ -57,22 +27,13 @@ endif |
| 1106 |
- |
| 1107 |
- erasure_codelib_LTLIBRARIES += libec_shec_generic.la |
| 1108 |
- |
| 1109 |
--libec_shec_neon_la_SOURCES = ${shec_sources} \ |
| 1110 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \ |
| 1111 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \ |
| 1112 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \ |
| 1113 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \ |
| 1114 |
-- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c |
| 1115 |
-+libec_shec_neon_la_SOURCES = ${shec_sources} |
| 1116 |
- libec_shec_neon_la_CFLAGS = ${AM_CFLAGS} \ |
| 1117 |
- ${ARM_NEON_FLAGS} \ |
| 1118 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1119 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1120 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1121 |
- -I$(srcdir)/erasure-code/shec |
| 1122 |
- libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 1123 |
- ${ARM_NEON_FLAGS} \ |
| 1124 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1125 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1126 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1127 |
- -I$(srcdir)/erasure-code/shec |
| 1128 |
- libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 1129 |
-@@ -91,8 +52,6 @@ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \ |
| 1130 |
- ${INTEL_SSE2_FLAGS} \ |
| 1131 |
- ${INTEL_SSE3_FLAGS} \ |
| 1132 |
- ${INTEL_SSSE3_FLAGS} \ |
| 1133 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1134 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1135 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1136 |
- -I$(srcdir)/erasure-code/shec |
| 1137 |
- libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 1138 |
-@@ -100,8 +59,6 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 1139 |
- ${INTEL_SSE2_FLAGS} \ |
| 1140 |
- ${INTEL_SSE3_FLAGS} \ |
| 1141 |
- ${INTEL_SSSE3_FLAGS} \ |
| 1142 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1143 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1144 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1145 |
- -I$(srcdir)/erasure-code/shec |
| 1146 |
- libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 1147 |
-@@ -122,8 +79,6 @@ libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS} \ |
| 1148 |
- ${INTEL_SSSE3_FLAGS} \ |
| 1149 |
- ${INTEL_SSE4_1_FLAGS} \ |
| 1150 |
- ${INTEL_SSE4_2_FLAGS} \ |
| 1151 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1152 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1153 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1154 |
- -I$(srcdir)/erasure-code/shec |
| 1155 |
- libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 1156 |
-@@ -133,8 +88,6 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
| 1157 |
- ${INTEL_SSSE3_FLAGS} \ |
| 1158 |
- ${INTEL_SSE4_1_FLAGS} \ |
| 1159 |
- ${INTEL_SSE4_2_FLAGS} \ |
| 1160 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1161 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1162 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1163 |
- -I$(srcdir)/erasure-code/shec |
| 1164 |
- libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
| 1165 |
-diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c |
| 1166 |
-index 15b62c9..bf5d290 100755 |
| 1167 |
---- a/src/erasure-code/shec/determinant.c |
| 1168 |
-+++ b/src/erasure-code/shec/determinant.c |
| 1169 |
-@@ -19,7 +19,7 @@ |
| 1170 |
- #include <stdlib.h> |
| 1171 |
- #include <string.h> |
| 1172 |
- |
| 1173 |
--#include "jerasure/include/galois.h" |
| 1174 |
-+#include "galois.h" |
| 1175 |
- |
| 1176 |
- void print_matrix(int *mat, int dim) |
| 1177 |
- { |
| 1178 |
-diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am |
| 1179 |
-index bdce080..11895ae 100644 |
| 1180 |
---- a/src/test/erasure-code/Makefile.am |
| 1181 |
-+++ b/src/test/erasure-code/Makefile.am |
| 1182 |
-@@ -166,12 +166,8 @@ check_TESTPROGRAMS += unittest_erasure_code |
| 1183 |
- unittest_erasure_code_jerasure_SOURCES = \ |
| 1184 |
- test/erasure-code/TestErasureCodeJerasure.cc \ |
| 1185 |
- ${jerasure_sources} |
| 1186 |
--unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \ |
| 1187 |
-- -Ierasure-code/jerasure/gf-complete/include \ |
| 1188 |
-- -Ierasure-code/jerasure/jerasure/include |
| 1189 |
--unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \ |
| 1190 |
-- -Ierasure-code/jerasure/gf-complete/include \ |
| 1191 |
-- -Ierasure-code/jerasure/jerasure/include |
| 1192 |
-+unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) |
| 1193 |
-+unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) |
| 1194 |
- unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
| 1195 |
- if LINUX |
| 1196 |
- unittest_erasure_code_jerasure_LDADD += -ldl |
| 1197 |
-@@ -232,13 +228,9 @@ unittest_erasure_code_shec_SOURCES = \ |
| 1198 |
- test/erasure-code/TestErasureCodeShec.cc \ |
| 1199 |
- ${shec_sources} |
| 1200 |
- unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \ |
| 1201 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1202 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1203 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1204 |
- -I$(srcdir)/erasure-code/shec |
| 1205 |
- unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
| 1206 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1207 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1208 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1209 |
- -I$(srcdir)/erasure-code/shec |
| 1210 |
- unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
| 1211 |
-@@ -251,13 +243,9 @@ unittest_erasure_code_shec_all_SOURCES = \ |
| 1212 |
- test/erasure-code/TestErasureCodeShec_all.cc \ |
| 1213 |
- ${shec_sources} |
| 1214 |
- unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \ |
| 1215 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1216 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1217 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1218 |
- -I$(srcdir)/erasure-code/shec |
| 1219 |
- unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
| 1220 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1221 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1222 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1223 |
- -I$(srcdir)/erasure-code/shec |
| 1224 |
- unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
| 1225 |
-@@ -270,13 +258,9 @@ unittest_erasure_code_shec_thread_SOURCES = \ |
| 1226 |
- test/erasure-code/TestErasureCodeShec_thread.cc \ |
| 1227 |
- ${shec_sources} |
| 1228 |
- unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \ |
| 1229 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1230 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1231 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1232 |
- -I$(srcdir)/erasure-code/shec |
| 1233 |
- unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
| 1234 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1235 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1236 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1237 |
- -I$(srcdir)/erasure-code/shec |
| 1238 |
- unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
| 1239 |
-@@ -289,13 +273,9 @@ unittest_erasure_code_shec_arguments_SOURCES = \ |
| 1240 |
- test/erasure-code/TestErasureCodeShec_arguments.cc \ |
| 1241 |
- ${shec_sources} |
| 1242 |
- unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \ |
| 1243 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1244 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1245 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1246 |
- -I$(srcdir)/erasure-code/shec |
| 1247 |
- unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
| 1248 |
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
| 1249 |
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
| 1250 |
- -I$(srcdir)/erasure-code/jerasure \ |
| 1251 |
- -I$(srcdir)/erasure-code/shec |
| 1252 |
- unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
| 1253 |
|
| 1254 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch b/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch |
| 1255 |
deleted file mode 100644 |
| 1256 |
index d767d81..0000000 |
| 1257 |
--- a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch |
| 1258 |
+++ /dev/null |
| 1259 |
@@ -1,33 +0,0 @@ |
| 1260 |
-commit dc2ffda7819d2ebeed3526d9e6da8f53221818de |
| 1261 |
-Author: Yehuda Sadeh <yehuda@××××××.com> |
| 1262 |
-Date: Thu Oct 20 10:17:36 2016 -0700 |
| 1263 |
- |
| 1264 |
- rgw: handle empty POST condition |
| 1265 |
- |
| 1266 |
- Fixes: http://tracker.ceph.com/issues/17635 |
| 1267 |
- |
| 1268 |
- Before accessing json entity, need to check that iterator is valid. |
| 1269 |
- If there is no entry return appropriate error code. |
| 1270 |
- |
| 1271 |
- Signed-off-by: Yehuda Sadeh <yehuda@××××××.com> |
| 1272 |
- (cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12) |
| 1273 |
- |
| 1274 |
-diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc |
| 1275 |
-index 3843511..8af70a8 100644 |
| 1276 |
---- a/src/rgw/rgw_policy_s3.cc |
| 1277 |
-+++ b/src/rgw/rgw_policy_s3.cc |
| 1278 |
-@@ -286,11 +286,13 @@ int RGWPolicy::from_json(bufferlist& bl, string& err_msg) |
| 1279 |
- int r = add_condition(v[0], v[1], v[2], err_msg); |
| 1280 |
- if (r < 0) |
| 1281 |
- return r; |
| 1282 |
-- } else { |
| 1283 |
-+ } else if (!citer.end()) { |
| 1284 |
- JSONObj *c = *citer; |
| 1285 |
- dout(0) << "adding simple_check: " << c->get_name() << " : " << c->get_data() << dendl; |
| 1286 |
- |
| 1287 |
- add_simple_check(c->get_name(), c->get_data()); |
| 1288 |
-+ } else { |
| 1289 |
-+ return -EINVAL; |
| 1290 |
- } |
| 1291 |
- } |
| 1292 |
- return 0; |
| 1293 |
|
| 1294 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch b/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch |
| 1295 |
deleted file mode 100644 |
| 1296 |
index ffc1645..0000000 |
| 1297 |
--- a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch |
| 1298 |
+++ /dev/null |
| 1299 |
@@ -1,32 +0,0 @@ |
| 1300 |
-diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc |
| 1301 |
-index c476129..cad54b8 100644 |
| 1302 |
---- a/src/rgw/librgw.cc |
| 1303 |
-+++ b/src/rgw/librgw.cc |
| 1304 |
-@@ -470,7 +470,11 @@ namespace rgw { |
| 1305 |
- const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn; |
| 1306 |
- const string& ldap_dnattr = |
| 1307 |
- store->ctx()->_conf->rgw_ldap_dnattr; |
| 1308 |
-+#ifdef HAVE_OPENLDAP |
| 1309 |
- std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx()); |
| 1310 |
-+#else |
| 1311 |
-+ std::string ldap_bindpw; |
| 1312 |
-+#endif /* HAVE_OPENLDAP */ |
| 1313 |
- |
| 1314 |
- ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw.c_str(), |
| 1315 |
- ldap_searchdn, ldap_dnattr); |
| 1316 |
-diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc |
| 1317 |
-index e9f24f3..7291e69 100644 |
| 1318 |
---- a/src/rgw/rgw_rest_s3.cc |
| 1319 |
-+++ b/src/rgw/rgw_rest_s3.cc |
| 1320 |
-@@ -3091,7 +3091,11 @@ void RGW_Auth_S3::init_impl(RGWRados* store) |
| 1321 |
- const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn; |
| 1322 |
- const string& ldap_dnattr = |
| 1323 |
- store->ctx()->_conf->rgw_ldap_dnattr; |
| 1324 |
-+#ifdef HAVE_OPENLDAP |
| 1325 |
- std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx()); |
| 1326 |
-+#else |
| 1327 |
-+ std::string ldap_bindpw; |
| 1328 |
-+#endif /* HAVE_OPENLDAP */ |
| 1329 |
- |
| 1330 |
- ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw, |
| 1331 |
- ldap_searchdn, ldap_dnattr); |
| 1332 |
|
| 1333 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch |
| 1334 |
deleted file mode 100644 |
| 1335 |
index 08a7920..0000000 |
| 1336 |
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch |
| 1337 |
+++ /dev/null |
| 1338 |
@@ -1,22 +0,0 @@ |
| 1339 |
-commit e1dc386f93eb4613dc7e89cc76a031aeee5022ba |
| 1340 |
-Author: Oleh Prypin <oleh@××××.in> |
| 1341 |
-Date: Thu Jul 21 18:33:25 2016 +0300 |
| 1342 |
- |
| 1343 |
- pybind: Make CephFS bindings and tests compatible with Python 3 |
| 1344 |
- |
| 1345 |
- Signed-off-by: Oleh Prypin <oleh@××××.in> |
| 1346 |
- |
| 1347 |
-diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx |
| 1348 |
-index ac17ada1a1..bd14de3b16 100644 |
| 1349 |
---- a/src/pybind/cephfs/cephfs.pyx |
| 1350 |
-+++ b/src/pybind/cephfs/cephfs.pyx |
| 1351 |
-@@ -613,8 +613,7 @@ cdef class LibCephFS(object): |
| 1352 |
- |
| 1353 |
- if not isinstance(mode, int): |
| 1354 |
- raise TypeError('mode must be an int') |
| 1355 |
-- if isinstance(flags, basestring): |
| 1356 |
-- flags = cstr(flags, 'flags') |
| 1357 |
-+ if isinstance(flags, str_type): |
| 1358 |
- cephfs_flags = 0 |
| 1359 |
- if flags == '': |
| 1360 |
- cephfs_flags = os.O_RDONLY |
| 1361 |
|
| 1362 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch |
| 1363 |
deleted file mode 100644 |
| 1364 |
index a81aae6..0000000 |
| 1365 |
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch |
| 1366 |
+++ /dev/null |
| 1367 |
@@ -1,45 +0,0 @@ |
| 1368 |
-commit 773e01294da518c6ec18f0a8b72e05def85fef6c |
| 1369 |
-Author: Oleh Prypin <oleh@××××.in> |
| 1370 |
-Date: Fri Jun 24 15:48:57 2016 +0300 |
| 1371 |
- |
| 1372 |
- pybind: Make RBD Python bindings compatible with Python 3 |
| 1373 |
- |
| 1374 |
- Signed-off-by: Oleh Prypin <oleh@××××.in> |
| 1375 |
- |
| 1376 |
-diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx |
| 1377 |
-index 52727bf39e..8f25dfbee0 100644 |
| 1378 |
---- a/src/pybind/rbd/rbd.pyx |
| 1379 |
-+++ b/src/pybind/rbd/rbd.pyx |
| 1380 |
-@@ -745,7 +745,7 @@ class RBD(object): |
| 1381 |
- break |
| 1382 |
- elif ret != -errno.ERANGE: |
| 1383 |
- raise make_ex(ret, 'error listing images') |
| 1384 |
-- return [decode_cstr(name) for name in c_names[:ret].split('\0') |
| 1385 |
-+ return [decode_cstr(name) for name in c_names[:ret].split(b'\0') |
| 1386 |
- if name] |
| 1387 |
- finally: |
| 1388 |
- free(c_names) |
| 1389 |
-@@ -1885,8 +1885,8 @@ written." % (self.name, ret, length)) |
| 1390 |
- raise make_ex(ret, 'error listing images') |
| 1391 |
- if ret == 0: |
| 1392 |
- return [] |
| 1393 |
-- pools = map(decode_cstr, c_pools[:pools_size - 1].split('\0')) |
| 1394 |
-- images = map(decode_cstr, c_images[:images_size - 1].split('\0')) |
| 1395 |
-+ pools = map(decode_cstr, c_pools[:pools_size - 1].split(b'\0')) |
| 1396 |
-+ images = map(decode_cstr, c_images[:images_size - 1].split(b'\0')) |
| 1397 |
- return list(zip(pools, images)) |
| 1398 |
- finally: |
| 1399 |
- free(c_pools) |
| 1400 |
-@@ -1933,9 +1933,9 @@ written." % (self.name, ret, length)) |
| 1401 |
- raise make_ex(ret, 'error listing images') |
| 1402 |
- if ret == 0: |
| 1403 |
- return [] |
| 1404 |
-- clients = map(decode_cstr, c_clients[:clients_size - 1].split('\0')) |
| 1405 |
-- cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split('\0')) |
| 1406 |
-- addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split('\0')) |
| 1407 |
-+ clients = map(decode_cstr, c_clients[:clients_size - 1].split(b'\0')) |
| 1408 |
-+ cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split(b'\0')) |
| 1409 |
-+ addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split(b'\0')) |
| 1410 |
- return { |
| 1411 |
- 'tag' : decode_cstr(c_tag), |
| 1412 |
- 'exclusive' : exclusive == 1, |
| 1413 |
|
| 1414 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch b/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch |
| 1415 |
deleted file mode 100644 |
| 1416 |
index 4e76dea..0000000 |
| 1417 |
--- a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch |
| 1418 |
+++ /dev/null |
| 1419 |
@@ -1,49 +0,0 @@ |
| 1420 |
-From 5a11f31aac4fa6a5c5ebb4fa0964e1c07a420e8c Mon Sep 17 00:00:00 2001 |
| 1421 |
-From: Zac Medico <zmedico@g.o> |
| 1422 |
-Date: Wed, 12 Apr 2017 01:49:09 -0700 |
| 1423 |
-Subject: [PATCH] configure: link against zstd if detected |
| 1424 |
- |
| 1425 |
-https://bugs.gentoo.org/show_bug.cgi?id=601610 |
| 1426 |
---- |
| 1427 |
- configure.ac | 6 ++++-- |
| 1428 |
- src/Makefile-env.am | 3 +++ |
| 1429 |
- 2 files changed, 7 insertions(+), 2 deletions(-) |
| 1430 |
- |
| 1431 |
-diff --git a/configure.ac b/configure.ac |
| 1432 |
-index 51daf91..8914b71 100644 |
| 1433 |
---- a/configure.ac |
| 1434 |
-+++ b/configure.ac |
| 1435 |
-@@ -851,12 +851,14 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"], |
| 1436 |
- AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" ]) |
| 1437 |
- AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" -o "x$with_librocksdb" = "xyes" ]) |
| 1438 |
- |
| 1439 |
--# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same. |
| 1440 |
-+# rocksdb detects headers in its Makefile, which forces us to do the same. |
| 1441 |
- AS_IF([test "x$with_librocksdb_static" = "xyes"], [ |
| 1442 |
- AC_CHECK_HEADER([bzlib.h], [have_bzlib=yes]) |
| 1443 |
-- AC_CHECK_HEADER([lz4.h], [have_lz4=yes])]) |
| 1444 |
-+ AC_CHECK_HEADER([lz4.h], [have_lz4=yes])] |
| 1445 |
-+ AC_CHECK_HEADER([zstd.h], [have_zstd=yes])]) |
| 1446 |
- AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"]) |
| 1447 |
- AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"]) |
| 1448 |
-+AM_CONDITIONAL(HAVE_ZSTD, [test "x$have_zstd" = "xyes"]) |
| 1449 |
- |
| 1450 |
- # needs libcurl and libxml2 |
| 1451 |
- if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then |
| 1452 |
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am |
| 1453 |
-index 4771bad..0ee42f8 100644 |
| 1454 |
---- a/src/Makefile-env.am |
| 1455 |
-+++ b/src/Makefile-env.am |
| 1456 |
-@@ -280,6 +280,9 @@ endif |
| 1457 |
- if HAVE_LZ4 |
| 1458 |
- LIBKV += -llz4 |
| 1459 |
- endif |
| 1460 |
-+if HAVE_ZSTD |
| 1461 |
-+LIBKV += -lzstd |
| 1462 |
-+endif |
| 1463 |
- endif # WITH_SLIBROCKSDB |
| 1464 |
- LIBKV += -lz -lleveldb -lsnappy |
| 1465 |
- LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS) |
| 1466 |
--- |
| 1467 |
-2.10.2 |
| 1468 |
- |
| 1469 |
|
| 1470 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch b/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch |
| 1471 |
deleted file mode 100644 |
| 1472 |
index 31221ae..0000000 |
| 1473 |
--- a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch |
| 1474 |
+++ /dev/null |
| 1475 |
@@ -1,15 +0,0 @@ |
| 1476 |
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am |
| 1477 |
-index 4771bad02d..f92e20479b 100644 |
| 1478 |
---- a/src/Makefile-env.am |
| 1479 |
-+++ b/src/Makefile-env.am |
| 1480 |
-@@ -53,10 +53,6 @@ endif |
| 1481 |
- ## automake environment |
| 1482 |
- |
| 1483 |
- HARDENING_CFLAGS = \ |
| 1484 |
-- -O2 \ |
| 1485 |
-- -g \ |
| 1486 |
-- -pipe \ |
| 1487 |
-- -Wall \ |
| 1488 |
- -Wp,-U_FORTIFY_SOURCE \ |
| 1489 |
- -Wp,-D_FORTIFY_SOURCE=2 \ |
| 1490 |
- -fexceptions \ |
| 1491 |
|
| 1492 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch b/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch |
| 1493 |
deleted file mode 100644 |
| 1494 |
index a6b5515..0000000 |
| 1495 |
--- a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch |
| 1496 |
+++ /dev/null |
| 1497 |
@@ -1,65 +0,0 @@ |
| 1498 |
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am |
| 1499 |
-index 3926ac4bec..90e2eae50c 100644 |
| 1500 |
---- a/src/ceph-detect-init/Makefile.am |
| 1501 |
-+++ b/src/ceph-detect-init/Makefile.am |
| 1502 |
-@@ -67,7 +67,7 @@ ceph-detect-init-clean: |
| 1503 |
- ceph-detect-init-install-data: |
| 1504 |
- cd $(srcdir)/ceph-detect-init ; \ |
| 1505 |
- if test "$(DESTDIR)" ; then \ |
| 1506 |
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1507 |
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1508 |
- options=--install-layout=deb ; \ |
| 1509 |
- else \ |
| 1510 |
- options=--prefix=/usr ; \ |
| 1511 |
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am |
| 1512 |
-index a8532878c8..d908b1649a 100644 |
| 1513 |
---- a/src/ceph-disk/Makefile.am |
| 1514 |
-+++ b/src/ceph-disk/Makefile.am |
| 1515 |
-@@ -43,7 +43,7 @@ ceph-disk-clean: |
| 1516 |
- ceph-disk-install-data: |
| 1517 |
- cd $(srcdir)/ceph-disk ; \ |
| 1518 |
- if test "$(DESTDIR)" ; then \ |
| 1519 |
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1520 |
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1521 |
- options=--install-layout=deb ; \ |
| 1522 |
- else \ |
| 1523 |
- options=--prefix=/usr ; \ |
| 1524 |
-diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am |
| 1525 |
-index 698522daa4..c49c190986 100644 |
| 1526 |
---- a/src/pybind/cephfs/Makefile.am |
| 1527 |
-+++ b/src/pybind/cephfs/Makefile.am |
| 1528 |
-@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver.h |
| 1529 |
- |
| 1530 |
- cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h |
| 1531 |
- if test "$(DESTDIR)" ; then \ |
| 1532 |
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1533 |
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1534 |
- options=--install-layout=deb ; \ |
| 1535 |
- else \ |
| 1536 |
- options=--prefix=/usr ; \ |
| 1537 |
-diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am |
| 1538 |
-index a4145bf0f4..960395fee8 100644 |
| 1539 |
---- a/src/pybind/rados/Makefile.am |
| 1540 |
-+++ b/src/pybind/rados/Makefile.am |
| 1541 |
-@@ -15,7 +15,7 @@ rados-pybind-clean: ${srcdir}/ceph_ver.h |
| 1542 |
- |
| 1543 |
- rados-pybind-install-exec: ${srcdir}/ceph_ver.h |
| 1544 |
- if test "$(DESTDIR)" ; then \ |
| 1545 |
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1546 |
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1547 |
- options=--install-layout=deb ; \ |
| 1548 |
- else \ |
| 1549 |
- options=--prefix=/usr ; \ |
| 1550 |
-diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am |
| 1551 |
-index 7dd49333fa..fbb940d07d 100644 |
| 1552 |
---- a/src/pybind/rbd/Makefile.am |
| 1553 |
-+++ b/src/pybind/rbd/Makefile.am |
| 1554 |
-@@ -15,7 +15,7 @@ rbd-pybind-clean: ${srcdir}/ceph_ver.h |
| 1555 |
- |
| 1556 |
- rbd-pybind-install-exec: ${srcdir}/ceph_ver.h |
| 1557 |
- if test "$(DESTDIR)" ; then \ |
| 1558 |
-- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1559 |
-+ if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ |
| 1560 |
- options=--install-layout=deb ; \ |
| 1561 |
- else \ |
| 1562 |
- options=--prefix=/usr ; \ |
| 1563 |
|
| 1564 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch |
| 1565 |
deleted file mode 100644 |
| 1566 |
index 0f02e6e..0000000 |
| 1567 |
--- a/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch |
| 1568 |
+++ /dev/null |
| 1569 |
@@ -1,13 +0,0 @@ |
| 1570 |
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake |
| 1571 |
-index 24d1a50654..a9fac61196 100644 |
| 1572 |
---- a/cmake/modules/Distutils.cmake |
| 1573 |
-+++ b/cmake/modules/Distutils.cmake |
| 1574 |
-@@ -43,7 +43,7 @@ function(distutils_add_cython_module name src) |
| 1575 |
- CC=${PY_CC} |
| 1576 |
- CXX=${PY_CXX} |
| 1577 |
- LDSHARED=${PY_LDSHARED} |
| 1578 |
-- OPT=\"-DNDEBUG -g -fwrapv -O2 -w\" |
| 1579 |
-+ OPT=\"-DNDEBUG -fwrapv -w\" |
| 1580 |
- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
| 1581 |
- CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} |
| 1582 |
- CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
| 1583 |
|
| 1584 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.0-use-provided-cpu-flag-values.patch b/sys-cluster/ceph/files/ceph-12.2.0-use-provided-cpu-flag-values.patch |
| 1585 |
deleted file mode 100644 |
| 1586 |
index 55c82b0..0000000 |
| 1587 |
--- a/sys-cluster/ceph/files/ceph-12.2.0-use-provided-cpu-flag-values.patch |
| 1588 |
+++ /dev/null |
| 1589 |
@@ -1,37 +0,0 @@ |
| 1590 |
-diff --git a/cmake/modules/SIMDExt.cmake b/cmake/modules/SIMDExt.cmake |
| 1591 |
-index 5330835aa1..a4dd881e34 100644 |
| 1592 |
---- a/cmake/modules/SIMDExt.cmake |
| 1593 |
-+++ b/cmake/modules/SIMDExt.cmake |
| 1594 |
-@@ -76,32 +76,25 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|ARM") |
| 1595 |
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") |
| 1596 |
- set(HAVE_INTEL 1) |
| 1597 |
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64") |
| 1598 |
-- CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE) |
| 1599 |
- if(HAVE_INTEL_SSE) |
| 1600 |
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse") |
| 1601 |
- endif() |
| 1602 |
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") |
| 1603 |
-- CHECK_C_COMPILER_FLAG(-msse2 HAVE_INTEL_SSE2) |
| 1604 |
- if(HAVE_INTEL_SSE2) |
| 1605 |
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2") |
| 1606 |
- endif() |
| 1607 |
-- CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3) |
| 1608 |
- if(HAVE_INTEL_SSE3) |
| 1609 |
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3") |
| 1610 |
- endif() |
| 1611 |
-- CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3) |
| 1612 |
- if(HAVE_INTEL_SSSE3) |
| 1613 |
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3") |
| 1614 |
- endif() |
| 1615 |
-- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL) |
| 1616 |
- if(HAVE_INTEL_PCLMUL) |
| 1617 |
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul") |
| 1618 |
- endif() |
| 1619 |
-- CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1) |
| 1620 |
- if(HAVE_INTEL_SSE4_1) |
| 1621 |
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1") |
| 1622 |
- endif() |
| 1623 |
-- CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2) |
| 1624 |
- if(HAVE_INTEL_SSE4_2) |
| 1625 |
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2") |
| 1626 |
- endif() |
| 1627 |
|
| 1628 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch b/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch |
| 1629 |
deleted file mode 100644 |
| 1630 |
index 28d1a02..0000000 |
| 1631 |
--- a/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch |
| 1632 |
+++ /dev/null |
| 1633 |
@@ -1,10 +0,0 @@ |
| 1634 |
-diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt |
| 1635 |
-index 3b03b6e613..c359ad2df9 100644 |
| 1636 |
---- a/systemd/CMakeLists.txt |
| 1637 |
-+++ b/systemd/CMakeLists.txt |
| 1638 |
-@@ -17,4 +17,4 @@ install(FILES |
| 1639 |
- ceph-disk@.service |
| 1640 |
- ceph-volume@.service |
| 1641 |
- rbdmap.service |
| 1642 |
-- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/systemd/system) |
| 1643 |
-+ DESTINATION ${SYSTEMD_UNITDIR}) |
| 1644 |
|
| 1645 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch |
| 1646 |
deleted file mode 100644 |
| 1647 |
index cd9eb48..0000000 |
| 1648 |
--- a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch |
| 1649 |
+++ /dev/null |
| 1650 |
@@ -1,13 +0,0 @@ |
| 1651 |
-diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc |
| 1652 |
-index 0074c7964b..98991be7d2 100644 |
| 1653 |
---- a/src/osd/PrimaryLogPG.cc |
| 1654 |
-+++ b/src/osd/PrimaryLogPG.cc |
| 1655 |
-@@ -1582,7 +1582,7 @@ void PrimaryLogPG::calc_trim_to() |
| 1656 |
- if (limit != eversion_t() && |
| 1657 |
- limit != pg_trim_to && |
| 1658 |
- pg_log.get_log().approx_size() > target) { |
| 1659 |
-- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target, |
| 1660 |
-+ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() - target), |
| 1661 |
- cct->_conf->osd_pg_log_trim_max); |
| 1662 |
- if (num_to_trim < cct->_conf->osd_pg_log_trim_min && |
| 1663 |
- cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) { |
| 1664 |
|
| 1665 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch |
| 1666 |
deleted file mode 100644 |
| 1667 |
index a21bcc9..0000000 |
| 1668 |
--- a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch |
| 1669 |
+++ /dev/null |
| 1670 |
@@ -1,10 +0,0 @@ |
| 1671 |
---- a/src/civetweb/src/civetweb.c 2017-11-02 10:58:06.000000000 -0700 |
| 1672 |
-+++ b/src/civetweb/src/civetweb.c 2019-04-11 17:23:30.736346783 -0700 |
| 1673 |
-@@ -851,6 +851,7 @@ |
| 1674 |
- #include <openssl/crypto.h> |
| 1675 |
- #include <openssl/x509.h> |
| 1676 |
- #include <openssl/pem.h> |
| 1677 |
-+#include <openssl/engine.h> |
| 1678 |
- #else |
| 1679 |
- /* SSL loaded dynamically from DLL. |
| 1680 |
- * I put the prototypes here to be independent from OpenSSL source |
| 1681 |
|
| 1682 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch |
| 1683 |
deleted file mode 100644 |
| 1684 |
index 9a23e1e..0000000 |
| 1685 |
--- a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch |
| 1686 |
+++ /dev/null |
| 1687 |
@@ -1,13 +0,0 @@ |
| 1688 |
-diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc |
| 1689 |
-index cf4e38995e..7a4089fca9 100644 |
| 1690 |
---- a/src/rgw/rgw_crypt.cc |
| 1691 |
-+++ b/src/rgw/rgw_crypt.cc |
| 1692 |
-@@ -31,7 +31,7 @@ using namespace CryptoPP; |
| 1693 |
- #define dout_subsys ceph_subsys_rgw |
| 1694 |
- |
| 1695 |
- using namespace rgw; |
| 1696 |
--using ceph::crypto::PK11_ImportSymKey_FIPS; |
| 1697 |
-+//using ceph::crypto::PK11_ImportSymKey_FIPS; |
| 1698 |
- |
| 1699 |
- /** |
| 1700 |
- * Encryption in CTR mode. offset is used as IV for each block. |
| 1701 |
|
| 1702 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch |
| 1703 |
deleted file mode 100644 |
| 1704 |
index 1b72e54..0000000 |
| 1705 |
--- a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch |
| 1706 |
+++ /dev/null |
| 1707 |
@@ -1,20 +0,0 @@ |
| 1708 |
-diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt |
| 1709 |
-index 7aa42e9efd..66186b159f 100644 |
| 1710 |
---- a/src/tools/rbd/CMakeLists.txt |
| 1711 |
-+++ b/src/tools/rbd/CMakeLists.txt |
| 1712 |
-@@ -1,3 +1,6 @@ |
| 1713 |
-+set(CURSES_NEED_NCURSES TRUE) |
| 1714 |
-+find_package(Curses REQUIRED) |
| 1715 |
-+ |
| 1716 |
- set(rbd_srcs |
| 1717 |
- rbd.cc |
| 1718 |
- ArgumentTypes.cc |
| 1719 |
-@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados |
| 1720 |
- cls_journal_client cls_rbd_client |
| 1721 |
- rbd_types |
| 1722 |
- journal |
| 1723 |
-- ceph-common global |
| 1724 |
-+ ceph-common global ${CURSES_LIBRARIES} |
| 1725 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
| 1726 |
- if(WITH_KRBD) |
| 1727 |
- target_link_libraries(rbd |
| 1728 |
|
| 1729 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch |
| 1730 |
deleted file mode 100644 |
| 1731 |
index 1b63d6e..0000000 |
| 1732 |
--- a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch |
| 1733 |
+++ /dev/null |
| 1734 |
@@ -1,13 +0,0 @@ |
| 1735 |
-diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc |
| 1736 |
-index d95a397a84..d2cbf4b7b9 100644 |
| 1737 |
---- a/src/common/blkdev.cc |
| 1738 |
-+++ b/src/common/blkdev.cc |
| 1739 |
-@@ -225,7 +225,7 @@ int get_device_by_uuid(uuid_d dev_uuid, const char* label, char* partition, |
| 1740 |
- rc = get_block_device_base(partition, basename, |
| 1741 |
- sizeof(basename)); |
| 1742 |
- if (rc >= 0) { |
| 1743 |
-- strncpy(device, basename, sizeof(basename)); |
| 1744 |
-+ strncpy(device, basename, sizeof(device)); |
| 1745 |
- rc = 0; |
| 1746 |
- } else { |
| 1747 |
- rc = -ENODEV; |
| 1748 |
|
| 1749 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-boost-build-none-options.patch b/sys-cluster/ceph/files/ceph-12.2.4-boost-build-none-options.patch |
| 1750 |
deleted file mode 100644 |
| 1751 |
index 6e3ad41..0000000 |
| 1752 |
--- a/sys-cluster/ceph/files/ceph-12.2.4-boost-build-none-options.patch |
| 1753 |
+++ /dev/null |
| 1754 |
@@ -1,26 +0,0 @@ |
| 1755 |
-diff --git a/src/boost/tools/build/src/tools/features/debug-feature.jam b/src/boost/tools/build/src/tools/features/debug-feature.jam |
| 1756 |
-index 04958f9a..38b6acf1 100644 |
| 1757 |
---- a/src/boost/tools/build/src/tools/features/debug-feature.jam |
| 1758 |
-+++ b/src/boost/tools/build/src/tools/features/debug-feature.jam |
| 1759 |
-@@ -8,7 +8,7 @@ |
| 1760 |
- import feature ; |
| 1761 |
- |
| 1762 |
- feature.feature debug-symbols |
| 1763 |
-- : on off |
| 1764 |
-+ : on off none |
| 1765 |
- : propagated ; |
| 1766 |
- |
| 1767 |
- feature.feature profiling |
| 1768 |
-diff --git a/src/boost/tools/build/src/tools/features/optimization-feature.jam b/src/boost/tools/build/src/tools/features/optimization-feature.jam |
| 1769 |
-index 761f76f1..fb2a5dec 100644 |
| 1770 |
---- a/src/boost/tools/build/src/tools/features/optimization-feature.jam |
| 1771 |
-+++ b/src/boost/tools/build/src/tools/features/optimization-feature.jam |
| 1772 |
-@@ -8,7 +8,7 @@ |
| 1773 |
- import feature ; |
| 1774 |
- |
| 1775 |
- feature.feature optimization |
| 1776 |
-- : off speed space |
| 1777 |
-+ : off none speed space |
| 1778 |
- : propagated ; |
| 1779 |
- |
| 1780 |
- feature.feature inlining |
| 1781 |
|
| 1782 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch |
| 1783 |
deleted file mode 100644 |
| 1784 |
index 3535d8c..0000000 |
| 1785 |
--- a/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch |
| 1786 |
+++ /dev/null |
| 1787 |
@@ -1,38 +0,0 @@ |
| 1788 |
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake |
| 1789 |
-index c7cd39a110..e7b8115485 100644 |
| 1790 |
---- a/cmake/modules/BuildBoost.cmake |
| 1791 |
-+++ b/cmake/modules/BuildBoost.cmake |
| 1792 |
-@@ -29,7 +29,7 @@ function(do_build_boost version) |
| 1793 |
- else() |
| 1794 |
- list(APPEND boost_features "address-model=32") |
| 1795 |
- endif() |
| 1796 |
-- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX |
| 1797 |
-+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX |
| 1798 |
- list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") |
| 1799 |
- |
| 1800 |
- string(REPLACE ";" "," boost_with_libs "${Boost_BUILD_COMPONENTS}") |
| 1801 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 1802 |
-index 7aa8a4392e..c7543a62bd 100644 |
| 1803 |
---- a/src/CMakeLists.txt |
| 1804 |
-+++ b/src/CMakeLists.txt |
| 1805 |
-@@ -808,6 +808,7 @@ install(TARGETS ceph-mon DESTINATION bin) |
| 1806 |
- |
| 1807 |
- if (NOT WITH_SYSTEM_ROCKSDB) |
| 1808 |
- set(ROCKSDB_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON) |
| 1809 |
-+ list(APPEND ROCKSDB_CMAKE_ARGS -DDISABLE_WARNING_AS_ERROR=ON) |
| 1810 |
- |
| 1811 |
- if(ALLOCATOR STREQUAL "jemalloc") |
| 1812 |
- list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_JEMALLOC=ON) |
| 1813 |
-diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt |
| 1814 |
-index d9d2b6e560..1b2099fcbd 100644 |
| 1815 |
---- a/src/compressor/zstd/CMakeLists.txt |
| 1816 |
-+++ b/src/compressor/zstd/CMakeLists.txt |
| 1817 |
-@@ -1,7 +1,7 @@ |
| 1818 |
- # zstd |
| 1819 |
- |
| 1820 |
- # libzstd - build it statically |
| 1821 |
--set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable -O3) |
| 1822 |
-+set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable $ENV{CFLAGS}) |
| 1823 |
- |
| 1824 |
- include(ExternalProject) |
| 1825 |
- ExternalProject_Add(zstd_ext |
| 1826 |
|
| 1827 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch |
| 1828 |
deleted file mode 100644 |
| 1829 |
index d744318..0000000 |
| 1830 |
--- a/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch |
| 1831 |
+++ /dev/null |
| 1832 |
@@ -1,11 +0,0 @@ |
| 1833 |
---- ceph-12.2.4.orig/src/rocksdb/CMakeLists.txt 2018-03-05 19:06:21.016923872 -0800 |
| 1834 |
-+++ ceph-12.2.4/src/rocksdb/CMakeLists.txt 2018-03-05 19:09:01.798721666 -0800 |
| 1835 |
-@@ -147,7 +147,7 @@ |
| 1836 |
- endif() |
| 1837 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") |
| 1838 |
- if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") |
| 1839 |
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fno-omit-frame-pointer") |
| 1840 |
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer") |
| 1841 |
- include(CheckCXXCompilerFlag) |
| 1842 |
- CHECK_CXX_COMPILER_FLAG("-momit-leaf-frame-pointer" HAVE_OMIT_LEAF_FRAME_POINTER) |
| 1843 |
- if(HAVE_OMIT_LEAF_FRAME_POINTER) |
| 1844 |
|
| 1845 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch |
| 1846 |
deleted file mode 100644 |
| 1847 |
index 57482b3..0000000 |
| 1848 |
--- a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch |
| 1849 |
+++ /dev/null |
| 1850 |
@@ -1,165 +0,0 @@ |
| 1851 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 1852 |
-index aa90ba65da..ea65dd4209 100644 |
| 1853 |
---- a/CMakeLists.txt |
| 1854 |
-+++ b/CMakeLists.txt |
| 1855 |
-@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS |
| 1856 |
- set(BOOST_HEADER_COMPONENTS container) |
| 1857 |
- |
| 1858 |
- if(WITH_MGR) |
| 1859 |
-- list(APPEND BOOST_COMPONENTS python) |
| 1860 |
-+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION}) |
| 1861 |
- endif() |
| 1862 |
- if(WITH_BOOST_CONTEXT) |
| 1863 |
- list(APPEND BOOST_COMPONENTS context coroutine) |
| 1864 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 1865 |
-index 7aa8a4392e..111f669f2e 100644 |
| 1866 |
---- a/src/CMakeLists.txt |
| 1867 |
-+++ b/src/CMakeLists.txt |
| 1868 |
-@@ -622,13 +622,13 @@ set(ceph_common_objs |
| 1869 |
- $<TARGET_OBJECTS:crush_objs>) |
| 1870 |
- set(ceph_common_deps |
| 1871 |
- json_spirit erasure_code rt ${LIB_RESOLV} |
| 1872 |
-- Boost::thread |
| 1873 |
-- Boost::system |
| 1874 |
-- Boost::regex |
| 1875 |
-- Boost::random |
| 1876 |
-- Boost::program_options |
| 1877 |
-- Boost::date_time |
| 1878 |
-- Boost::iostreams |
| 1879 |
-+ boost_thread |
| 1880 |
-+ boost_system |
| 1881 |
-+ boost_regex |
| 1882 |
-+ boost_random |
| 1883 |
-+ boost_program_options |
| 1884 |
-+ boost_date_time |
| 1885 |
-+ boost_iostreams |
| 1886 |
- ${BLKID_LIBRARIES} |
| 1887 |
- ${Backtrace_LIBRARIES} |
| 1888 |
- ${BLKIN_LIBRARIES} |
| 1889 |
-@@ -712,7 +712,7 @@ if (WITH_MGR) |
| 1890 |
- $<TARGET_OBJECTS:heap_profiler_objs>) |
| 1891 |
- target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}") |
| 1892 |
- target_link_libraries(ceph-mgr osdc client global-static common |
| 1893 |
-- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
| 1894 |
-+ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
| 1895 |
- install(TARGETS ceph-mgr DESTINATION bin) |
| 1896 |
- endif (WITH_MGR) |
| 1897 |
- |
| 1898 |
-@@ -885,7 +885,7 @@ set(ceph_mds_srcs |
| 1899 |
- ceph_mds.cc) |
| 1900 |
- add_executable(ceph-mds ${ceph_mds_srcs}) |
| 1901 |
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common |
| 1902 |
-- Boost::thread) |
| 1903 |
-+ boost_thread) |
| 1904 |
- install(TARGETS ceph-mds DESTINATION bin) |
| 1905 |
- |
| 1906 |
- add_subdirectory(erasure-code) |
| 1907 |
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt |
| 1908 |
-index f3999e3b01..0ce7fca1ba 100644 |
| 1909 |
---- a/src/test/CMakeLists.txt |
| 1910 |
-+++ b/src/test/CMakeLists.txt |
| 1911 |
-@@ -148,7 +148,7 @@ add_executable(ceph_omapbench |
| 1912 |
- ) |
| 1913 |
- target_link_libraries(ceph_omapbench |
| 1914 |
- librados |
| 1915 |
-- Boost::program_options |
| 1916 |
-+ boost_program_options |
| 1917 |
- global |
| 1918 |
- ${BLKID_LIBRARIES} |
| 1919 |
- ${CMAKE_DL_LIBS} |
| 1920 |
-@@ -202,7 +202,7 @@ if(${WITH_RADOSGW}) |
| 1921 |
- cls_rgw_client |
| 1922 |
- cls_user_client |
| 1923 |
- cls_lock_client |
| 1924 |
-- Boost::regex |
| 1925 |
-+ boost_regex |
| 1926 |
- ${BLKID_LIBRARIES} |
| 1927 |
- ${CURL_LIBRARIES} |
| 1928 |
- ${EXPAT_LIBRARIES} |
| 1929 |
-@@ -232,7 +232,7 @@ if(${WITH_RADOSGW}) |
| 1930 |
- cls_rgw_client |
| 1931 |
- cls_user_client |
| 1932 |
- cls_lock_client |
| 1933 |
-- Boost::regex |
| 1934 |
-+ boost_regex |
| 1935 |
- ${BLKID_LIBRARIES} |
| 1936 |
- ${CURL_LIBRARIES} |
| 1937 |
- ${EXPAT_LIBRARIES} |
| 1938 |
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt |
| 1939 |
-index 9fba701e05..da3cbcfe96 100644 |
| 1940 |
---- a/src/test/bench/CMakeLists.txt |
| 1941 |
-+++ b/src/test/bench/CMakeLists.txt |
| 1942 |
-@@ -8,7 +8,7 @@ set(smalliobench_srcs |
| 1943 |
- add_executable(ceph_smalliobench |
| 1944 |
- ${smalliobench_srcs} |
| 1945 |
- ) |
| 1946 |
--target_link_libraries(ceph_smalliobench librados Boost::program_options global |
| 1947 |
-+target_link_libraries(ceph_smalliobench librados boost_program_options global |
| 1948 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
| 1949 |
- |
| 1950 |
- # ceph_smalliobenchrbd |
| 1951 |
-@@ -27,7 +27,7 @@ if(WITH_RBD) |
| 1952 |
- librados |
| 1953 |
- os |
| 1954 |
- global |
| 1955 |
-- Boost::program_options |
| 1956 |
-+ boost_program_options |
| 1957 |
- ${BLKID_LIBRARIES} |
| 1958 |
- ${CMAKE_DL_LIBS} |
| 1959 |
- ) |
| 1960 |
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs |
| 1961 |
- add_executable(ceph_smalliobenchfs |
| 1962 |
- ${ceph_smalliobenchfs_srcs} |
| 1963 |
- ) |
| 1964 |
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global |
| 1965 |
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global |
| 1966 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
| 1967 |
- |
| 1968 |
- # ceph_smalliobenchdumb |
| 1969 |
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs |
| 1970 |
- add_executable(ceph_smalliobenchdumb |
| 1971 |
- ${smalliobenchdumb_srcs} |
| 1972 |
- ) |
| 1973 |
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global |
| 1974 |
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global |
| 1975 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
| 1976 |
- |
| 1977 |
- # ceph_tpbench |
| 1978 |
-@@ -73,7 +73,7 @@ set(tpbench_srcs |
| 1979 |
- add_executable(ceph_tpbench |
| 1980 |
- ${tpbench_srcs} |
| 1981 |
- ) |
| 1982 |
--target_link_libraries(ceph_tpbench librados Boost::program_options global |
| 1983 |
-+target_link_libraries(ceph_tpbench librados boost_program_options global |
| 1984 |
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
| 1985 |
- |
| 1986 |
- install(TARGETS |
| 1987 |
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt |
| 1988 |
-index 9f72fa3b48..665c977606 100644 |
| 1989 |
---- a/src/tools/CMakeLists.txt |
| 1990 |
-+++ b/src/tools/CMakeLists.txt |
| 1991 |
-@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global) |
| 1992 |
- install(TARGETS ceph_radosacl DESTINATION bin) |
| 1993 |
- |
| 1994 |
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) |
| 1995 |
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options) |
| 1996 |
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options) |
| 1997 |
- install(TARGETS ceph-osdomap-tool DESTINATION bin) |
| 1998 |
- |
| 1999 |
- add_executable(ceph-monstore-tool |
| 2000 |
- ceph_monstore_tool.cc |
| 2001 |
- ../mgr/mgr_commands.cc) |
| 2002 |
--target_link_libraries(ceph-monstore-tool os global Boost::program_options) |
| 2003 |
-+target_link_libraries(ceph-monstore-tool os global boost_program_options) |
| 2004 |
- install(TARGETS ceph-monstore-tool DESTINATION bin) |
| 2005 |
- install(PROGRAMS |
| 2006 |
- ceph-monstore-update-crush.sh |
| 2007 |
-@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool |
| 2008 |
- ceph_objectstore_tool.cc |
| 2009 |
- rebuild_mondb.cc |
| 2010 |
- RadosDump.cc) |
| 2011 |
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) |
| 2012 |
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) |
| 2013 |
- if(WITH_FUSE) |
| 2014 |
- target_link_libraries(ceph-objectstore-tool fuse) |
| 2015 |
- endif(WITH_FUSE) |
| 2016 |
|
| 2017 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch |
| 2018 |
deleted file mode 100644 |
| 2019 |
index dd24e78..0000000 |
| 2020 |
--- a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch |
| 2021 |
+++ /dev/null |
| 2022 |
@@ -1,55 +0,0 @@ |
| 2023 |
-diff -ur ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt ceph-12.2.5/src/rapidjson/CMakeLists.txt |
| 2024 |
---- ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt 2018-07-09 11:18:09.188115751 -0700 |
| 2025 |
-+++ ceph-12.2.5/src/rapidjson/CMakeLists.txt 2018-07-09 11:36:56.848639110 -0700 |
| 2026 |
-@@ -50,7 +50,7 @@ |
| 2027 |
- endif(CCACHE_FOUND) |
| 2028 |
- |
| 2029 |
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") |
| 2030 |
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror") |
| 2031 |
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") |
| 2032 |
- if (RAPIDJSON_BUILD_CXX11) |
| 2033 |
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0") |
| 2034 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") |
| 2035 |
-@@ -73,7 +73,7 @@ |
| 2036 |
- endif() |
| 2037 |
- endif() |
| 2038 |
- elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
| 2039 |
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers") |
| 2040 |
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers") |
| 2041 |
- if (RAPIDJSON_BUILD_CXX11) |
| 2042 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") |
| 2043 |
- endif() |
| 2044 |
-diff -ur ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt ceph-12.2.5/src/rocksdb/CMakeLists.txt |
| 2045 |
---- ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt 2018-07-09 11:18:09.219115543 -0700 |
| 2046 |
-+++ ceph-12.2.5/src/rocksdb/CMakeLists.txt 2018-07-09 11:34:58.843411195 -0700 |
| 2047 |
-@@ -174,15 +174,6 @@ |
| 2048 |
- PROPERTIES COMPILE_FLAGS "-msse4.2") |
| 2049 |
- endif() |
| 2050 |
- |
| 2051 |
--option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON) |
| 2052 |
--if(FAIL_ON_WARNINGS) |
| 2053 |
-- if(MSVC) |
| 2054 |
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") |
| 2055 |
-- else() # assume GCC |
| 2056 |
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") |
| 2057 |
-- endif() |
| 2058 |
--endif() |
| 2059 |
-- |
| 2060 |
- option(WITH_ASAN "build with ASAN" OFF) |
| 2061 |
- if(WITH_ASAN) |
| 2062 |
- add_definitions(-DROCKSDB_TSAN_RUN) |
| 2063 |
-diff -ur ceph-12.2.5.orig/src/rocksdb/Makefile ceph-12.2.5/src/rocksdb/Makefile |
| 2064 |
---- ceph-12.2.5.orig/src/rocksdb/Makefile 2018-03-11 18:58:51.000000000 -0700 |
| 2065 |
-+++ ceph-12.2.5/src/rocksdb/Makefile 2018-07-09 11:35:53.847049123 -0700 |
| 2066 |
-@@ -243,11 +243,6 @@ |
| 2067 |
- WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \ |
| 2068 |
- -Wno-unused-parameter |
| 2069 |
- |
| 2070 |
--ifndef DISABLE_WARNING_AS_ERROR |
| 2071 |
-- WARNING_FLAGS += -Werror |
| 2072 |
--endif |
| 2073 |
-- |
| 2074 |
-- |
| 2075 |
- ifdef LUA_PATH |
| 2076 |
- |
| 2077 |
- ifndef LUA_INCLUDE |
| 2078 |
|
| 2079 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch |
| 2080 |
deleted file mode 100644 |
| 2081 |
index 8de09b9..0000000 |
| 2082 |
--- a/sys-cluster/ceph/files/ceph-13.2.0-boost-sonames.patch |
| 2083 |
+++ /dev/null |
| 2084 |
@@ -1,166 +0,0 @@ |
| 2085 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2086 |
-index 2f997d03f8..748cb190e6 100644 |
| 2087 |
---- a/CMakeLists.txt |
| 2088 |
-+++ b/CMakeLists.txt |
| 2089 |
-@@ -591,7 +591,7 @@ set(BOOST_COMPONENTS |
| 2090 |
- set(BOOST_HEADER_COMPONENTS container) |
| 2091 |
- |
| 2092 |
- if(WITH_MGR) |
| 2093 |
-- list(APPEND BOOST_COMPONENTS python) |
| 2094 |
-+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION}) |
| 2095 |
- endif() |
| 2096 |
- if(WITH_BOOST_CONTEXT) |
| 2097 |
- list(APPEND BOOST_COMPONENTS context coroutine) |
| 2098 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 2099 |
-index 3d3b4c0919..94ab42ef9f 100644 |
| 2100 |
---- a/src/CMakeLists.txt |
| 2101 |
-+++ b/src/CMakeLists.txt |
| 2102 |
-@@ -630,12 +630,12 @@ set(ceph_common_objs |
| 2103 |
- $<TARGET_OBJECTS:crush_objs>) |
| 2104 |
- set(ceph_common_deps |
| 2105 |
- json_spirit erasure_code ${LIB_RESOLV} |
| 2106 |
-- Boost::thread |
| 2107 |
-- Boost::system |
| 2108 |
-- Boost::random |
| 2109 |
-- Boost::program_options |
| 2110 |
-- Boost::date_time |
| 2111 |
-- Boost::iostreams |
| 2112 |
-+ boost_thread |
| 2113 |
-+ boost_system |
| 2114 |
-+ boost_random |
| 2115 |
-+ boost_program_options |
| 2116 |
-+ boost_date_time |
| 2117 |
-+ boost_iostreams |
| 2118 |
- ${BLKID_LIBRARIES} |
| 2119 |
- ${Backtrace_LIBRARIES} |
| 2120 |
- ${BLKIN_LIBRARIES} |
| 2121 |
-@@ -759,7 +759,7 @@ if (WITH_MGR) |
| 2122 |
- $<TARGET_OBJECTS:heap_profiler_objs>) |
| 2123 |
- target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") |
| 2124 |
- target_link_libraries(ceph-mgr osdc client global-static ceph-common |
| 2125 |
-- Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
| 2126 |
-+ boost_python-${EPYTHON_VERSION} ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
| 2127 |
- install(TARGETS ceph-mgr DESTINATION bin) |
| 2128 |
- endif (WITH_MGR) |
| 2129 |
- |
| 2130 |
-@@ -888,7 +888,7 @@ set(ceph_mds_srcs |
| 2131 |
- ceph_mds.cc) |
| 2132 |
- add_executable(ceph-mds ${ceph_mds_srcs}) |
| 2133 |
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common |
| 2134 |
-- Boost::thread) |
| 2135 |
-+ boost_thread) |
| 2136 |
- install(TARGETS ceph-mds DESTINATION bin) |
| 2137 |
- |
| 2138 |
- add_subdirectory(erasure-code) |
| 2139 |
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt |
| 2140 |
-index e9d3804c5f..5c6eb58de1 100644 |
| 2141 |
---- a/src/rbd_replay/CMakeLists.txt |
| 2142 |
-+++ b/src/rbd_replay/CMakeLists.txt |
| 2143 |
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) |
| 2144 |
- global |
| 2145 |
- babeltrace |
| 2146 |
- babeltrace-ctf |
| 2147 |
-- Boost::date_time |
| 2148 |
-+ boost_date_time |
| 2149 |
- ) |
| 2150 |
- install(TARGETS rbd-replay-prep DESTINATION bin) |
| 2151 |
- endif(HAVE_BABELTRACE) |
| 2152 |
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt |
| 2153 |
-index c1edd3b882..000c8daaf8 100644 |
| 2154 |
---- a/src/rgw/CMakeLists.txt |
| 2155 |
-+++ b/src/rgw/CMakeLists.txt |
| 2156 |
-@@ -162,7 +162,7 @@ target_link_libraries(rgw_a librados cls_otp_client cls_lock_client cls_rgw_clie |
| 2157 |
- |
| 2158 |
- if (WITH_RADOSGW_BEAST_FRONTEND) |
| 2159 |
- target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING) |
| 2160 |
-- target_link_libraries(rgw_a Boost::coroutine Boost::context) |
| 2161 |
-+ target_link_libraries(rgw_a boost_coroutine boost_context) |
| 2162 |
- endif() |
| 2163 |
- |
| 2164 |
- if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)) |
| 2165 |
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt |
| 2166 |
-index a43335e825..a0d056faaa 100644 |
| 2167 |
---- a/src/test/CMakeLists.txt |
| 2168 |
-+++ b/src/test/CMakeLists.txt |
| 2169 |
-@@ -147,7 +147,7 @@ add_executable(ceph_omapbench |
| 2170 |
- ) |
| 2171 |
- target_link_libraries(ceph_omapbench |
| 2172 |
- librados |
| 2173 |
-- Boost::program_options |
| 2174 |
-+ boost_program_options |
| 2175 |
- global |
| 2176 |
- ${BLKID_LIBRARIES} |
| 2177 |
- ${CMAKE_DL_LIBS} |
| 2178 |
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt |
| 2179 |
-index 4ba31ab2a8..ab66208b57 100644 |
| 2180 |
---- a/src/test/erasure-code/CMakeLists.txt |
| 2181 |
-+++ b/src/test/erasure-code/CMakeLists.txt |
| 2182 |
-@@ -2,15 +2,15 @@ |
| 2183 |
- add_executable(ceph_erasure_code_benchmark |
| 2184 |
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc |
| 2185 |
- ceph_erasure_code_benchmark.cc) |
| 2186 |
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
| 2187 |
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
| 2188 |
- install(TARGETS ceph_erasure_code_benchmark |
| 2189 |
- DESTINATION bin) |
| 2190 |
- |
| 2191 |
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) |
| 2192 |
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
| 2193 |
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
| 2194 |
- |
| 2195 |
- add_executable(ceph_erasure_code ceph_erasure_code.cc) |
| 2196 |
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
| 2197 |
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
| 2198 |
- install(TARGETS ceph_erasure_code |
| 2199 |
- DESTINATION bin) |
| 2200 |
- |
| 2201 |
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt |
| 2202 |
-index 1c909ee1ce..7c1ef32df1 100644 |
| 2203 |
---- a/src/test/librados/CMakeLists.txt |
| 2204 |
-+++ b/src/test/librados/CMakeLists.txt |
| 2205 |
-@@ -61,7 +61,7 @@ set_target_properties(ceph_test_rados_api_asio PROPERTIES COMPILE_FLAGS |
| 2206 |
- target_link_libraries(ceph_test_rados_api_asio global |
| 2207 |
- librados ${UNITTEST_LIBS}) |
| 2208 |
- if(WITH_BOOST_CONTEXT) |
| 2209 |
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) |
| 2210 |
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) |
| 2211 |
- endif() |
| 2212 |
- |
| 2213 |
- # ceph_test_rados_api_list |
| 2214 |
-@@ -147,7 +147,7 @@ add_executable(ceph_test_rados_api_tier |
| 2215 |
- set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS |
| 2216 |
- ${UNITTEST_CXX_FLAGS}) |
| 2217 |
- target_link_libraries(ceph_test_rados_api_tier |
| 2218 |
-- librados global ${UNITTEST_LIBS} Boost::system radostest) |
| 2219 |
-+ librados global ${UNITTEST_LIBS} boost_system radostest) |
| 2220 |
- |
| 2221 |
- # ceph_test_rados_api_snapshots |
| 2222 |
- add_executable(ceph_test_rados_api_snapshots |
| 2223 |
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt |
| 2224 |
-index e0844ec0c7..886839302c 100644 |
| 2225 |
---- a/src/tools/CMakeLists.txt |
| 2226 |
-+++ b/src/tools/CMakeLists.txt |
| 2227 |
-@@ -29,20 +29,20 @@ install(PROGRAMS |
| 2228 |
- endif(WITH_TESTS) |
| 2229 |
- |
| 2230 |
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) |
| 2231 |
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options) |
| 2232 |
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options) |
| 2233 |
- install(TARGETS ceph-osdomap-tool DESTINATION bin) |
| 2234 |
- |
| 2235 |
- add_executable(ceph-monstore-tool |
| 2236 |
- ceph_monstore_tool.cc |
| 2237 |
- ../mgr/mgr_commands.cc) |
| 2238 |
--target_link_libraries(ceph-monstore-tool os global Boost::program_options) |
| 2239 |
-+target_link_libraries(ceph-monstore-tool os global boost_program_options) |
| 2240 |
- install(TARGETS ceph-monstore-tool DESTINATION bin) |
| 2241 |
- |
| 2242 |
- add_executable(ceph-objectstore-tool |
| 2243 |
- ceph_objectstore_tool.cc |
| 2244 |
- rebuild_mondb.cc |
| 2245 |
- RadosDump.cc) |
| 2246 |
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) |
| 2247 |
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) |
| 2248 |
- if(WITH_FUSE) |
| 2249 |
- target_link_libraries(ceph-objectstore-tool fuse) |
| 2250 |
- endif(WITH_FUSE) |
| 2251 |
|
| 2252 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-cflags.patch b/sys-cluster/ceph/files/ceph-13.2.0-cflags.patch |
| 2253 |
deleted file mode 100644 |
| 2254 |
index b275a17..0000000 |
| 2255 |
--- a/sys-cluster/ceph/files/ceph-13.2.0-cflags.patch |
| 2256 |
+++ /dev/null |
| 2257 |
@@ -1,26 +0,0 @@ |
| 2258 |
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake |
| 2259 |
-index d6572115a4..cc0bdddc9f 100644 |
| 2260 |
---- a/cmake/modules/BuildBoost.cmake |
| 2261 |
-+++ b/cmake/modules/BuildBoost.cmake |
| 2262 |
-@@ -62,7 +62,7 @@ function(do_build_boost version) |
| 2263 |
- else() |
| 2264 |
- list(APPEND boost_features "address-model=32") |
| 2265 |
- endif() |
| 2266 |
-- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX |
| 2267 |
-+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX |
| 2268 |
- list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") |
| 2269 |
- |
| 2270 |
- list(FIND Boost_BUILD_COMPONENTS "python" with_python) |
| 2271 |
-diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt |
| 2272 |
-index 5a80aa539c..8d6ff5c8f0 100644 |
| 2273 |
---- a/src/compressor/zstd/CMakeLists.txt |
| 2274 |
-+++ b/src/compressor/zstd/CMakeLists.txt |
| 2275 |
-@@ -1,7 +1,7 @@ |
| 2276 |
- # zstd |
| 2277 |
- |
| 2278 |
- # libzstd - build it statically |
| 2279 |
--set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3") |
| 2280 |
-+set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable $ENV{CFLAGS} -O3") |
| 2281 |
- |
| 2282 |
- include(ExternalProject) |
| 2283 |
- ExternalProject_Add(zstd_ext |
| 2284 |
|
| 2285 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch b/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch |
| 2286 |
deleted file mode 100644 |
| 2287 |
index 0dc90eb..0000000 |
| 2288 |
--- a/sys-cluster/ceph/files/ceph-13.2.0-mgr-python-version.patch |
| 2289 |
+++ /dev/null |
| 2290 |
@@ -1,16 +0,0 @@ |
| 2291 |
-diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt |
| 2292 |
-index c996cd9402..f99765702b 100644 |
| 2293 |
---- a/src/pybind/CMakeLists.txt |
| 2294 |
-+++ b/src/pybind/CMakeLists.txt |
| 2295 |
-@@ -62,11 +62,6 @@ foreach(python_version ${py_vers}) |
| 2296 |
- endforeach() |
| 2297 |
- |
| 2298 |
- if(WITH_MGR) |
| 2299 |
-- if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2) |
| 2300 |
-- message(FATAL_ERROR "mgr plugins require python2 binding") |
| 2301 |
-- elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3) |
| 2302 |
-- message(FATAL_ERROR "mgr plugins require python3 binding") |
| 2303 |
-- endif() |
| 2304 |
- # Location needs to match default setting for mgr_module_path, currently: |
| 2305 |
- # OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr") |
| 2306 |
- install(DIRECTORY |
| 2307 |
|
| 2308 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch |
| 2309 |
deleted file mode 100644 |
| 2310 |
index 470dbae..0000000 |
| 2311 |
--- a/sys-cluster/ceph/files/ceph-13.2.0-no-virtualenvs.patch |
| 2312 |
+++ /dev/null |
| 2313 |
@@ -1,78 +0,0 @@ |
| 2314 |
-diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt |
| 2315 |
-index 6e5946b784..233cccfc9b 100644 |
| 2316 |
---- a/src/ceph-detect-init/CMakeLists.txt |
| 2317 |
-+++ b/src/ceph-detect-init/CMakeLists.txt |
| 2318 |
-@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua |
| 2319 |
- |
| 2320 |
- add_custom_target(ceph-detect-init |
| 2321 |
- COMMAND |
| 2322 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && |
| 2323 |
-- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . |
| 2324 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && |
| 2325 |
-+ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . |
| 2326 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init |
| 2327 |
- COMMENT "ceph-detect-init is being created") |
| 2328 |
- add_dependencies(tests ceph-detect-init) |
| 2329 |
-diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt |
| 2330 |
-index 00aaec4a80..b0700c488f 100644 |
| 2331 |
---- a/src/ceph-disk/CMakeLists.txt |
| 2332 |
-+++ b/src/ceph-disk/CMakeLists.txt |
| 2333 |
-@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv) |
| 2334 |
- |
| 2335 |
- add_custom_target(ceph-disk |
| 2336 |
- COMMAND |
| 2337 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && |
| 2338 |
-- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . |
| 2339 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && |
| 2340 |
-+ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . |
| 2341 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk |
| 2342 |
- COMMENT "ceph-disk is being created") |
| 2343 |
- add_dependencies(tests ceph-disk) |
| 2344 |
-diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt |
| 2345 |
-index 2b050f6c6e..e9fb87f76b 100644 |
| 2346 |
---- a/src/pybind/mgr/dashboard/CMakeLists.txt |
| 2347 |
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt |
| 2348 |
-@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) |
| 2349 |
- |
| 2350 |
- add_custom_target(mgr-dashboard-test-venv |
| 2351 |
- COMMAND |
| 2352 |
-- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
| 2353 |
-+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} |
| 2354 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard |
| 2355 |
- COMMENT "dashboard tests virtualenv is being created") |
| 2356 |
- add_dependencies(tests mgr-dashboard-test-venv) |
| 2357 |
-@@ -13,9 +13,9 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env) |
| 2358 |
- |
| 2359 |
- add_custom_command( |
| 2360 |
- OUTPUT "${mgr-dashboard-nodeenv}/bin/npm" |
| 2361 |
-- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv} |
| 2362 |
-- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv |
| 2363 |
-- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0 |
| 2364 |
-+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv} |
| 2365 |
-+ #COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv |
| 2366 |
-+ #COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0 |
| 2367 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
| 2368 |
- COMMENT "dashboard nodeenv is being installed" |
| 2369 |
- ) |
| 2370 |
-@@ -27,7 +27,7 @@ add_custom_target(mgr-dashboard-nodeenv |
| 2371 |
- |
| 2372 |
- add_custom_command( |
| 2373 |
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules" |
| 2374 |
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate |
| 2375 |
-+ #COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm install && deactivate |
| 2376 |
- DEPENDS frontend/package.json |
| 2377 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend |
| 2378 |
- COMMENT "dashboard frontend dependencies are being installed" |
| 2379 |
-@@ -62,9 +62,11 @@ else() |
| 2380 |
- set(npm_command npm run build) |
| 2381 |
- endif() |
| 2382 |
- |
| 2383 |
-+LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin) |
| 2384 |
-+ |
| 2385 |
- add_custom_command( |
| 2386 |
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist" |
| 2387 |
-- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate |
| 2388 |
-+ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command} |
| 2389 |
- DEPENDS ${frontend_src} frontend/node_modules |
| 2390 |
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend |
| 2391 |
- COMMENT "dashboard frontend is being created" |
| 2392 |
|
| 2393 |
diff --git a/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch b/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch |
| 2394 |
deleted file mode 100644 |
| 2395 |
index 4fbc8b6..0000000 |
| 2396 |
--- a/sys-cluster/ceph/files/ceph-13.2.2-dont-install-sysvinit-script.patch |
| 2397 |
+++ /dev/null |
| 2398 |
@@ -1,15 +0,0 @@ |
| 2399 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 2400 |
-index 874eabfaa1..e337f4cf8e 100644 |
| 2401 |
---- a/src/CMakeLists.txt |
| 2402 |
-+++ b/src/CMakeLists.txt |
| 2403 |
-@@ -601,10 +601,6 @@ install(PROGRAMS |
| 2404 |
- ${CMAKE_SOURCE_DIR}/src/ceph-run |
| 2405 |
- ${CMAKE_SOURCE_DIR}/src/ceph-clsinfo |
| 2406 |
- DESTINATION bin) |
| 2407 |
--install(PROGRAMS |
| 2408 |
-- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/init-ceph |
| 2409 |
-- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d |
| 2410 |
-- RENAME ceph) |
| 2411 |
- |
| 2412 |
- install(FILES |
| 2413 |
- ${CMAKE_SOURCE_DIR}/share/id_rsa_drop.ceph.com |
| 2414 |
|
| 2415 |
diff --git a/sys-cluster/ceph/files/ceph-mds_at.service b/sys-cluster/ceph/files/ceph-mds_at.service |
| 2416 |
deleted file mode 100644 |
| 2417 |
index c28604e..0000000 |
| 2418 |
--- a/sys-cluster/ceph/files/ceph-mds_at.service |
| 2419 |
+++ /dev/null |
| 2420 |
@@ -1,12 +0,0 @@ |
| 2421 |
-[Unit] |
| 2422 |
-Description=Ceph metadata server daemon |
| 2423 |
-After=network-online.target local-fs.target |
| 2424 |
-Wants=network-online.target local-fs.target |
| 2425 |
-PartOf=ceph.target |
| 2426 |
- |
| 2427 |
-[Service] |
| 2428 |
-Environment=CLUSTER=ceph |
| 2429 |
-ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i |
| 2430 |
- |
| 2431 |
-[Install] |
| 2432 |
-WantedBy=ceph.target |
| 2433 |
|
| 2434 |
diff --git a/sys-cluster/ceph/files/ceph-mds_at.service.conf b/sys-cluster/ceph/files/ceph-mds_at.service.conf |
| 2435 |
deleted file mode 100644 |
| 2436 |
index 0172cbe..0000000 |
| 2437 |
--- a/sys-cluster/ceph/files/ceph-mds_at.service.conf |
| 2438 |
+++ /dev/null |
| 2439 |
@@ -1,4 +0,0 @@ |
| 2440 |
-# Uncomment the following lines to configure the cluster name for Ceph MDSs. |
| 2441 |
- |
| 2442 |
-#[Service] |
| 2443 |
-#Environment=CLUSTER=ceph |
| 2444 |
|
| 2445 |
diff --git a/sys-cluster/ceph/files/ceph-osd_at.service b/sys-cluster/ceph/files/ceph-osd_at.service |
| 2446 |
deleted file mode 100644 |
| 2447 |
index 7bf125f..0000000 |
| 2448 |
--- a/sys-cluster/ceph/files/ceph-osd_at.service |
| 2449 |
+++ /dev/null |
| 2450 |
@@ -1,13 +0,0 @@ |
| 2451 |
-[Unit] |
| 2452 |
-Description=Ceph object storage daemon |
| 2453 |
-After=network-online.target local-fs.target |
| 2454 |
-Wants=network-online.target local-fs.target |
| 2455 |
-PartOf=ceph.target |
| 2456 |
- |
| 2457 |
-[Service] |
| 2458 |
-Environment=CLUSTER=ceph |
| 2459 |
-ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i |
| 2460 |
-ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i |
| 2461 |
- |
| 2462 |
-[Install] |
| 2463 |
-WantedBy=ceph.target |
| 2464 |
|
| 2465 |
diff --git a/sys-cluster/ceph/files/ceph-osd_at.service.conf b/sys-cluster/ceph/files/ceph-osd_at.service.conf |
| 2466 |
deleted file mode 100644 |
| 2467 |
index 959b948..0000000 |
| 2468 |
--- a/sys-cluster/ceph/files/ceph-osd_at.service.conf |
| 2469 |
+++ /dev/null |
| 2470 |
@@ -1,4 +0,0 @@ |
| 2471 |
-# Uncomment the following lines to configure the cluster name for Ceph OSDs. |
| 2472 |
- |
| 2473 |
-#[Service] |
| 2474 |
-#Environment=CLUSTER=ceph |
| 2475 |
|
| 2476 |
diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1 |
| 2477 |
deleted file mode 100644 |
| 2478 |
index 3bdb8b4..0000000 |
| 2479 |
--- a/sys-cluster/ceph/files/ceph.confd-r1 |
| 2480 |
+++ /dev/null |
| 2481 |
@@ -1,4 +0,0 @@ |
| 2482 |
-# Example |
| 2483 |
- |
| 2484 |
-# default ceph conf file |
| 2485 |
-#ceph_conf="/etc/ceph/ceph.conf" |
| 2486 |
|
| 2487 |
diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3 |
| 2488 |
deleted file mode 100644 |
| 2489 |
index 281037c..0000000 |
| 2490 |
--- a/sys-cluster/ceph/files/ceph.confd-r3 |
| 2491 |
+++ /dev/null |
| 2492 |
@@ -1,63 +0,0 @@ |
| 2493 |
-# /etc/conf.d/ceph: startup configurations for ceph |
| 2494 |
- |
| 2495 |
-# default ceph conf file |
| 2496 |
-#ceph_conf="/etc/ceph/ceph.conf" |
| 2497 |
- |
| 2498 |
-# Set ulimits for Ceph services. |
| 2499 |
-#rc_ulimit="-n 131072 -u 257256" |
| 2500 |
- |
| 2501 |
-# the directory under /run to store runtime information in |
| 2502 |
-#rundir=/run/ceph |
| 2503 |
- |
| 2504 |
-# the user and group to run ceph as |
| 2505 |
- |
| 2506 |
-# settings for openrc supervisor for various ceph daemons |
| 2507 |
-# |
| 2508 |
-# defaults (can be overidden for each daemon) |
| 2509 |
-# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value |
| 2510 |
-# |
| 2511 |
-#respawn_delay=20 |
| 2512 |
-#respawn_max=5 |
| 2513 |
-#respawn_period=1800 |
| 2514 |
-#stdout="/dev/null" |
| 2515 |
-#stderr="/dev/null" |
| 2516 |
- |
| 2517 |
-# radosgw |
| 2518 |
-#radosgw_respawn_max |
| 2519 |
-#radosgw_respawn_delay=20 |
| 2520 |
-#radosgw_respawn_period=1800 |
| 2521 |
-#radosgw_stdout="/dev/null" |
| 2522 |
-#radosgw_stderr="/dev/null" |
| 2523 |
- |
| 2524 |
-# mon |
| 2525 |
-#mon_respawn_max=5 |
| 2526 |
-#mon_respawn_delay=20 |
| 2527 |
-#mon_respawn_period=1800 |
| 2528 |
-#mon_stdout="/dev/null" |
| 2529 |
-#mon_stderr="/dev/null" |
| 2530 |
- |
| 2531 |
-# osd |
| 2532 |
-#osd_respawn_max=5 |
| 2533 |
-#osd_respawn_delay=30 |
| 2534 |
-#osd_respawn_period=1800 |
| 2535 |
-#osd_stdout="/dev/null" |
| 2536 |
-#osd_stderr="/dev/null" |
| 2537 |
- |
| 2538 |
-# mds |
| 2539 |
-#mds_respawn_max=5 |
| 2540 |
-#mds_respawn_delay=20 |
| 2541 |
-#mds_respawn_period=1800 |
| 2542 |
-#mds_stdout="/dev/null" |
| 2543 |
-#mds_stderr="/dev/null" |
| 2544 |
- |
| 2545 |
-# mgr |
| 2546 |
-#mgr_respawn_max=5 |
| 2547 |
-#mgr_respawn_delay=20 |
| 2548 |
-#mgr_respawn_period=1800 |
| 2549 |
-#mgr_stdout="/dev/null" |
| 2550 |
-#mgr_stderr="/dev/null" |
| 2551 |
- |
| 2552 |
-# initd stop timeout. |
| 2553 |
-#CEPH_TERMTIMEOUT="TERM/120/KILL/5" |
| 2554 |
-# |
| 2555 |
-# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet: |
| 2556 |
|
| 2557 |
diff --git a/sys-cluster/ceph/files/ceph.confd-r4 b/sys-cluster/ceph/files/ceph.confd-r4 |
| 2558 |
deleted file mode 100644 |
| 2559 |
index b8a0c93..0000000 |
| 2560 |
--- a/sys-cluster/ceph/files/ceph.confd-r4 |
| 2561 |
+++ /dev/null |
| 2562 |
@@ -1,70 +0,0 @@ |
| 2563 |
-# /etc/conf.d/ceph: startup configurations for ceph |
| 2564 |
- |
| 2565 |
-# default ceph conf file |
| 2566 |
-#ceph_conf="/etc/ceph/ceph.conf" |
| 2567 |
- |
| 2568 |
-# Set ulimits for Ceph services. |
| 2569 |
-#rc_ulimit="-n 1048576 -u 1048576" |
| 2570 |
- |
| 2571 |
-# the directory under /run to store runtime information in |
| 2572 |
-#rundir=/run/ceph |
| 2573 |
- |
| 2574 |
-# the user and group to run ceph as |
| 2575 |
-#user="ceph" |
| 2576 |
-#group="ceph" |
| 2577 |
- |
| 2578 |
-# tell openrc to use control groups to make sure everything gets killed |
| 2579 |
-# properly on stop. Highly reccommended to leave this enabled. |
| 2580 |
-rc_cgroup_cleanup=1 |
| 2581 |
- |
| 2582 |
-# settings for openrc supervisor for various ceph daemons |
| 2583 |
-# |
| 2584 |
-# defaults (can be overidden for each daemon) |
| 2585 |
-# stderr and stdout values get .${id}-std{out,err}.log appended |
| 2586 |
-# to the provided value |
| 2587 |
-# |
| 2588 |
-#respawn_delay=20 |
| 2589 |
-#respawn_max=5 |
| 2590 |
-#respawn_period=1800 |
| 2591 |
-#stdout="/dev/null" |
| 2592 |
-#stderr="/dev/null" |
| 2593 |
- |
| 2594 |
-# radosgw |
| 2595 |
-#radosgw_respawn_max |
| 2596 |
-#radosgw_respawn_delay=20 |
| 2597 |
-#radosgw_respawn_period=1800 |
| 2598 |
-#radosgw_stdout="/dev/null" |
| 2599 |
-#radosgw_stderr="/dev/null" |
| 2600 |
- |
| 2601 |
-# mon |
| 2602 |
-#mon_respawn_max=5 |
| 2603 |
-#mon_respawn_delay=20 |
| 2604 |
-#mon_respawn_period=1800 |
| 2605 |
-#mon_stdout="/dev/null" |
| 2606 |
-#mon_stderr="/dev/null" |
| 2607 |
- |
| 2608 |
-# osd |
| 2609 |
-#osd_respawn_max=5 |
| 2610 |
-#osd_respawn_delay=30 |
| 2611 |
-#osd_respawn_period=1800 |
| 2612 |
-#osd_stdout="/dev/null" |
| 2613 |
-#osd_stderr="/dev/null" |
| 2614 |
- |
| 2615 |
-# mds |
| 2616 |
-#mds_respawn_max=5 |
| 2617 |
-#mds_respawn_delay=20 |
| 2618 |
-#mds_respawn_period=1800 |
| 2619 |
-#mds_stdout="/dev/null" |
| 2620 |
-#mds_stderr="/dev/null" |
| 2621 |
- |
| 2622 |
-# mgr |
| 2623 |
-#mgr_respawn_max=5 |
| 2624 |
-#mgr_respawn_delay=20 |
| 2625 |
-#mgr_respawn_period=1800 |
| 2626 |
-#mgr_stdout="/dev/null" |
| 2627 |
-#mgr_stderr="/dev/null" |
| 2628 |
- |
| 2629 |
-# initd stop timeout. |
| 2630 |
-#CEPH_TERMTIMEOUT="TERM/120/KILL/5" |
| 2631 |
-# |
| 2632 |
-# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet: |
| 2633 |
|
| 2634 |
diff --git a/sys-cluster/ceph/files/ceph.confd-r5 b/sys-cluster/ceph/files/ceph.confd-r5 |
| 2635 |
deleted file mode 100644 |
| 2636 |
index 5d11439..0000000 |
| 2637 |
--- a/sys-cluster/ceph/files/ceph.confd-r5 |
| 2638 |
+++ /dev/null |
| 2639 |
@@ -1,15 +0,0 @@ |
| 2640 |
-# Example |
| 2641 |
- |
| 2642 |
-# default ceph conf file |
| 2643 |
-#ceph_conf="/etc/ceph/ceph.conf" |
| 2644 |
- |
| 2645 |
-# Set RADOSGW_WANT_NAME_PARAM=y in order to make the init script add |
| 2646 |
-# a --name=client.${RC_SVCNAME} parameter to command_args for radosgw.* |
| 2647 |
-# service instances. This will make the service use a key by the name |
| 2648 |
-# of client.${RC_SVCNAME} instead of the default client.admin key. |
| 2649 |
-# A setting like this in the ceph config file can be used to customize |
| 2650 |
-# the rgw_data and keyring paths used by radosgw instances: |
| 2651 |
-# [client] |
| 2652 |
-# rgw_data = /var/lib/ceph/radosgw/$cluster-$id |
| 2653 |
-# keyring = /var/lib/ceph/radosgw/$cluster-$id/keyring |
| 2654 |
-RADOSGW_WANT_NAME_PARAM=n |
| 2655 |
|
| 2656 |
diff --git a/sys-cluster/ceph/files/ceph.initd-r10 b/sys-cluster/ceph/files/ceph.initd-r10 |
| 2657 |
deleted file mode 100644 |
| 2658 |
index 2f5150f..0000000 |
| 2659 |
--- a/sys-cluster/ceph/files/ceph.initd-r10 |
| 2660 |
+++ /dev/null |
| 2661 |
@@ -1,108 +0,0 @@ |
| 2662 |
-#!/sbin/openrc-run |
| 2663 |
- |
| 2664 |
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" |
| 2665 |
-extra_commands="reload" |
| 2666 |
-daemon_type="${RC_SVCNAME#ceph-}" |
| 2667 |
-daemon_type="${daemon_type%%.*}" |
| 2668 |
-daemon_id="${RC_SVCNAME#ceph-*.}" |
| 2669 |
-daemon_id="${daemon_id:-0}" |
| 2670 |
-: ${rundir:=/run/ceph} |
| 2671 |
-: ${user:=ceph} |
| 2672 |
-: ${group:=ceph} |
| 2673 |
-: ${rc_ulimit:=-n 1048576 -u 1048576} |
| 2674 |
- |
| 2675 |
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" |
| 2676 |
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" |
| 2677 |
- |
| 2678 |
-command="/usr/bin/${RC_SVCNAME%%.*}" |
| 2679 |
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" |
| 2680 |
-command_args_foreground="--foreground" |
| 2681 |
- |
| 2682 |
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" |
| 2683 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
| 2684 |
-supervise_daemon_args="--user ${user} --group ${group}" |
| 2685 |
- |
| 2686 |
-: ${supervisor:=supervise-daemon} |
| 2687 |
-: ${stdout:=/var/log/ceph/ceph} |
| 2688 |
-: ${stderr:=/var/log/ceph/ceph} |
| 2689 |
-: ${respawn_delay:=10} |
| 2690 |
-: ${respawn_max:=5} |
| 2691 |
-: ${respawn_period:=1800} |
| 2692 |
- |
| 2693 |
-: ${osd_respawn_delay:=15} |
| 2694 |
-: ${osd_respawn_max:=10} |
| 2695 |
- |
| 2696 |
-: ${radosgw_respawn_max:=5} |
| 2697 |
-: ${radosgw_respawn_period:=30} |
| 2698 |
- |
| 2699 |
-depend() { |
| 2700 |
- use dns logger |
| 2701 |
- after net ntpd ntp-client chronyd |
| 2702 |
- before netmount |
| 2703 |
-} |
| 2704 |
- |
| 2705 |
-is_type_valid() { |
| 2706 |
- case ${daemon_type} in |
| 2707 |
- mon|mds|osd|mgr|radosgw) return 0;; |
| 2708 |
- *) return 1;; |
| 2709 |
- esac |
| 2710 |
-} |
| 2711 |
- |
| 2712 |
-start_pre() { |
| 2713 |
- local logdir |
| 2714 |
- export CEPH_CONF="${ceph_conf}" |
| 2715 |
- |
| 2716 |
- checkpath -d -q -o "${user}:${group}" "${rundir}" |
| 2717 |
- |
| 2718 |
- if ! is_type_valid ;then |
| 2719 |
- eerror "Please give valid Ceph Server Type: mds, mon, osd" |
| 2720 |
- return 1 |
| 2721 |
- |
| 2722 |
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then |
| 2723 |
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start" |
| 2724 |
- return 1 |
| 2725 |
- fi |
| 2726 |
- |
| 2727 |
- if [ -n "${bluestore_osd_fsid}" ]; then |
| 2728 |
- einfo "Mounting Bluestore" |
| 2729 |
- ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd |
| 2730 |
- fi |
| 2731 |
- |
| 2732 |
- if [ ${daemon_type} = radosgw ] && [ ${RADOSGW_WANT_NAME_PARAM} = y ]; then |
| 2733 |
- command_args="${command_args} --name client.${daemon_id}" |
| 2734 |
- fi |
| 2735 |
- |
| 2736 |
- local arg_name arg_val |
| 2737 |
- for arg_name in std{out,err} respawn_{delay,max,period}; do |
| 2738 |
- eval arg_val="\${${daemon_type}_${arg_name}}" |
| 2739 |
- |
| 2740 |
- if [ -z "${arg_val}" ]; then |
| 2741 |
- eval arg_val="\${${arg_name}}" |
| 2742 |
- else |
| 2743 |
- eval "${arg_name}=\"${arg_val}\"" |
| 2744 |
- fi |
| 2745 |
- |
| 2746 |
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then |
| 2747 |
- local log_file log_postfix |
| 2748 |
- log_postfix=".${daemon_id}-${arg_name}.log" |
| 2749 |
- log_file="${arg_val}" |
| 2750 |
- |
| 2751 |
- if [ "${log_file}" != /dev/null ]; then |
| 2752 |
- log_file="${log_file}${log_postfix}" |
| 2753 |
- fi |
| 2754 |
- |
| 2755 |
- log_dir="$(dirname "${log_file}")" |
| 2756 |
- checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}" |
| 2757 |
- |
| 2758 |
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}" |
| 2759 |
- fi |
| 2760 |
- done |
| 2761 |
-} |
| 2762 |
- |
| 2763 |
-reload() { |
| 2764 |
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" |
| 2765 |
- start-stop-daemon --signal 1 "${start_stop_daemon_args}" |
| 2766 |
- eend ${?} |
| 2767 |
-} |
| 2768 |
- |
| 2769 |
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |
| 2770 |
|
| 2771 |
diff --git a/sys-cluster/ceph/files/ceph.initd-r2 b/sys-cluster/ceph/files/ceph.initd-r2 |
| 2772 |
deleted file mode 100644 |
| 2773 |
index 16267c5..0000000 |
| 2774 |
--- a/sys-cluster/ceph/files/ceph.initd-r2 |
| 2775 |
+++ /dev/null |
| 2776 |
@@ -1,40 +0,0 @@ |
| 2777 |
-#!/sbin/openrc-run |
| 2778 |
- |
| 2779 |
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" |
| 2780 |
-extra_commands="reload" |
| 2781 |
-daemon_type="${RC_SVCNAME#ceph-}" |
| 2782 |
-daemon_type="${daemon_type%.*}" |
| 2783 |
-daemon_id="${RC_SVCNAME#ceph-*.}" |
| 2784 |
-daemon_id="${daemon_id:-0}" |
| 2785 |
-command="/usr/bin/ceph-${daemon_type}" |
| 2786 |
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid" |
| 2787 |
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}" |
| 2788 |
-start_stop_daemon_args="--user ceph --group ceph" |
| 2789 |
- |
| 2790 |
-depend() { |
| 2791 |
- after net ntpd ntp-client chronyd |
| 2792 |
- before netmount |
| 2793 |
-} |
| 2794 |
- |
| 2795 |
-is_type_valid() { |
| 2796 |
- case ${daemon_type} in |
| 2797 |
- mon|mds|osd) return 0;; |
| 2798 |
- *) return 1;; |
| 2799 |
- esac |
| 2800 |
-} |
| 2801 |
- |
| 2802 |
-start_pre() { |
| 2803 |
- checkpath -d -q -o ceph "$(dirname "${pidfile}")" |
| 2804 |
- if ! is_type_valid ;then |
| 2805 |
- eerror "Please give valid Ceph Server Type: mds, mon, osd" |
| 2806 |
- return 1 |
| 2807 |
- fi |
| 2808 |
-} |
| 2809 |
- |
| 2810 |
-reload() { |
| 2811 |
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" |
| 2812 |
- start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}" |
| 2813 |
- eend $? |
| 2814 |
-} |
| 2815 |
- |
| 2816 |
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |
| 2817 |
|
| 2818 |
diff --git a/sys-cluster/ceph/files/ceph.initd-r7 b/sys-cluster/ceph/files/ceph.initd-r7 |
| 2819 |
deleted file mode 100644 |
| 2820 |
index 110d7bd..0000000 |
| 2821 |
--- a/sys-cluster/ceph/files/ceph.initd-r7 |
| 2822 |
+++ /dev/null |
| 2823 |
@@ -1,87 +0,0 @@ |
| 2824 |
-#!/sbin/openrc-run |
| 2825 |
- |
| 2826 |
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" |
| 2827 |
-extra_commands="reload" |
| 2828 |
-daemon_type="${RC_SVCNAME#ceph-}" |
| 2829 |
-daemon_type="${daemon_type%%.*}" |
| 2830 |
-daemon_id="${RC_SVCNAME#ceph-*.}" |
| 2831 |
-daemon_id="${daemon_id:-0}" |
| 2832 |
-: ${rundir:=/run/ceph} |
| 2833 |
-: ${user:=ceph} |
| 2834 |
-: ${group:=ceph} |
| 2835 |
-: ${rc_ulimit:=-n 1048576 -u 1048576} |
| 2836 |
- |
| 2837 |
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" |
| 2838 |
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" |
| 2839 |
- |
| 2840 |
-command="/usr/bin/${RC_SVCNAME%%.*}" |
| 2841 |
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" |
| 2842 |
-command_args_foreground="--foreground" |
| 2843 |
- |
| 2844 |
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" |
| 2845 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
| 2846 |
-supervise_daemon_args="--user ${user} --group ${group}" |
| 2847 |
- |
| 2848 |
-: ${supervisor:=supervise-daemon} |
| 2849 |
-: ${stdout:=/var/log/ceph/ceph} |
| 2850 |
-: ${stderr:=/var/log/ceph/ceph} |
| 2851 |
-: ${respawn_delay:=10} |
| 2852 |
-: ${respawn_max:=5} |
| 2853 |
-: ${respawn_period:=1800} |
| 2854 |
- |
| 2855 |
-: ${osd_respawn_delay:=15} |
| 2856 |
-: ${osd_respawn_max:=10} |
| 2857 |
- |
| 2858 |
-: ${radosgw_respawn_max:=5} |
| 2859 |
-: ${radosgw_respawn_period:=30} |
| 2860 |
- |
| 2861 |
-depend() { |
| 2862 |
- use dns logger |
| 2863 |
- after net ntpd ntp-client chronyd |
| 2864 |
- before netmount |
| 2865 |
-} |
| 2866 |
- |
| 2867 |
-is_type_valid() { |
| 2868 |
- case ${daemon_type} in |
| 2869 |
- mon|mds|osd|mgr|radosgw) return 0;; |
| 2870 |
- *) return 1;; |
| 2871 |
- esac |
| 2872 |
-} |
| 2873 |
- |
| 2874 |
-start_pre() { |
| 2875 |
- export CEPH_CONF="${ceph_conf}" |
| 2876 |
- |
| 2877 |
- checkpath -d -q -o "${user}:${group}" "${rundir}" |
| 2878 |
- |
| 2879 |
- if ! is_type_valid ;then |
| 2880 |
- eerror "Please give valid Ceph Server Type: mds, mon, osd" |
| 2881 |
- return 1 |
| 2882 |
- |
| 2883 |
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then |
| 2884 |
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start" |
| 2885 |
- return 1 |
| 2886 |
- fi |
| 2887 |
- |
| 2888 |
- local arg_name arg_val |
| 2889 |
- for arg_name in std{out,err} respawn_{delay,max,period}; do |
| 2890 |
- eval arg_val="\${${daemon_type}_${arg_name}}" |
| 2891 |
- |
| 2892 |
- if [ -z "${arg_val}" ]; then |
| 2893 |
- eval arg_val="\${${arg_name}}" |
| 2894 |
- else |
| 2895 |
- eval "${arg_name}=\"${arg_val}\"" |
| 2896 |
- fi |
| 2897 |
- |
| 2898 |
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then |
| 2899 |
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log" |
| 2900 |
- fi |
| 2901 |
- done |
| 2902 |
-} |
| 2903 |
- |
| 2904 |
-reload() { |
| 2905 |
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" |
| 2906 |
- start-stop-daemon --signal 1 "${start_stop_daemon_args}" |
| 2907 |
- eend ${?} |
| 2908 |
-} |
| 2909 |
- |
| 2910 |
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |
| 2911 |
|
| 2912 |
diff --git a/sys-cluster/ceph/files/ceph.initd-r8 b/sys-cluster/ceph/files/ceph.initd-r8 |
| 2913 |
deleted file mode 100644 |
| 2914 |
index 2ef2ed1..0000000 |
| 2915 |
--- a/sys-cluster/ceph/files/ceph.initd-r8 |
| 2916 |
+++ /dev/null |
| 2917 |
@@ -1,95 +0,0 @@ |
| 2918 |
-#!/sbin/openrc-run |
| 2919 |
- |
| 2920 |
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" |
| 2921 |
-extra_commands="reload" |
| 2922 |
-daemon_type="${RC_SVCNAME#ceph-}" |
| 2923 |
-daemon_type="${daemon_type%%.*}" |
| 2924 |
-daemon_id="${RC_SVCNAME#ceph-*.}" |
| 2925 |
-daemon_id="${daemon_id:-0}" |
| 2926 |
-: ${rundir:=/run/ceph} |
| 2927 |
-: ${user:=ceph} |
| 2928 |
-: ${group:=ceph} |
| 2929 |
-: ${rc_ulimit:=-n 1048576 -u 1048576} |
| 2930 |
- |
| 2931 |
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" |
| 2932 |
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" |
| 2933 |
- |
| 2934 |
-command="/usr/bin/${RC_SVCNAME%%.*}" |
| 2935 |
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" |
| 2936 |
-command_args_foreground="--foreground" |
| 2937 |
- |
| 2938 |
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" |
| 2939 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
| 2940 |
-supervise_daemon_args="--user ${user} --group ${group}" |
| 2941 |
- |
| 2942 |
-: ${supervisor:=supervise-daemon} |
| 2943 |
-: ${stdout:=/var/log/ceph/ceph} |
| 2944 |
-: ${stderr:=/var/log/ceph/ceph} |
| 2945 |
-: ${respawn_delay:=10} |
| 2946 |
-: ${respawn_max:=5} |
| 2947 |
-: ${respawn_period:=1800} |
| 2948 |
- |
| 2949 |
-: ${osd_respawn_delay:=15} |
| 2950 |
-: ${osd_respawn_max:=10} |
| 2951 |
- |
| 2952 |
-: ${radosgw_respawn_max:=5} |
| 2953 |
-: ${radosgw_respawn_period:=30} |
| 2954 |
- |
| 2955 |
-depend() { |
| 2956 |
- use dns logger |
| 2957 |
- after net ntpd ntp-client chronyd |
| 2958 |
- before netmount |
| 2959 |
-} |
| 2960 |
- |
| 2961 |
-is_type_valid() { |
| 2962 |
- case ${daemon_type} in |
| 2963 |
- mon|mds|osd|mgr|radosgw) return 0;; |
| 2964 |
- *) return 1;; |
| 2965 |
- esac |
| 2966 |
-} |
| 2967 |
- |
| 2968 |
-start_pre() { |
| 2969 |
- export CEPH_CONF="${ceph_conf}" |
| 2970 |
- |
| 2971 |
- checkpath -d -q -o "${user}:${group}" "${rundir}" |
| 2972 |
- |
| 2973 |
- if ! is_type_valid ;then |
| 2974 |
- eerror "Please give valid Ceph Server Type: mds, mon, osd" |
| 2975 |
- return 1 |
| 2976 |
- |
| 2977 |
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then |
| 2978 |
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start" |
| 2979 |
- return 1 |
| 2980 |
- fi |
| 2981 |
- |
| 2982 |
- local arg_name arg_val |
| 2983 |
- for arg_name in std{out,err} respawn_{delay,max,period}; do |
| 2984 |
- eval arg_val="\${${daemon_type}_${arg_name}}" |
| 2985 |
- |
| 2986 |
- if [ -z "${arg_val}" ]; then |
| 2987 |
- eval arg_val="\${${arg_name}}" |
| 2988 |
- else |
| 2989 |
- eval "${arg_name}=\"${arg_val}\"" |
| 2990 |
- fi |
| 2991 |
- |
| 2992 |
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then |
| 2993 |
- local log_file log_postfix |
| 2994 |
- log_postfix=".${daemon_id}-${arg_name}.log" |
| 2995 |
- log_file="${arg_val}" |
| 2996 |
- |
| 2997 |
- if [ "${log_file}" != /dev/null ]; then |
| 2998 |
- log_file="${log_file}${log_postfix}" |
| 2999 |
- fi |
| 3000 |
- |
| 3001 |
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}" |
| 3002 |
- fi |
| 3003 |
- done |
| 3004 |
-} |
| 3005 |
- |
| 3006 |
-reload() { |
| 3007 |
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" |
| 3008 |
- start-stop-daemon --signal 1 "${start_stop_daemon_args}" |
| 3009 |
- eend ${?} |
| 3010 |
-} |
| 3011 |
- |
| 3012 |
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |
| 3013 |
|
| 3014 |
diff --git a/sys-cluster/ceph/files/ceph.initd-r9 b/sys-cluster/ceph/files/ceph.initd-r9 |
| 3015 |
deleted file mode 100644 |
| 3016 |
index cfbd58e..0000000 |
| 3017 |
--- a/sys-cluster/ceph/files/ceph.initd-r9 |
| 3018 |
+++ /dev/null |
| 3019 |
@@ -1,97 +0,0 @@ |
| 3020 |
-#!/sbin/openrc-run |
| 3021 |
- |
| 3022 |
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" |
| 3023 |
-extra_commands="reload" |
| 3024 |
-daemon_type="${RC_SVCNAME#ceph-}" |
| 3025 |
-daemon_type="${daemon_type%%.*}" |
| 3026 |
-daemon_id="${RC_SVCNAME#ceph-*.}" |
| 3027 |
-daemon_id="${daemon_id:-0}" |
| 3028 |
-: ${rundir:=/run/ceph} |
| 3029 |
-: ${user:=ceph} |
| 3030 |
-: ${group:=ceph} |
| 3031 |
-: ${rc_ulimit:=-n 1048576 -u 1048576} |
| 3032 |
- |
| 3033 |
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" |
| 3034 |
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" |
| 3035 |
- |
| 3036 |
-command="/usr/bin/${RC_SVCNAME%%.*}" |
| 3037 |
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" |
| 3038 |
-command_args_foreground="--foreground" |
| 3039 |
- |
| 3040 |
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" |
| 3041 |
-start_stop_daemon_args="--user ${user} --group ${group}" |
| 3042 |
-supervise_daemon_args="--user ${user} --group ${group}" |
| 3043 |
- |
| 3044 |
-: ${supervisor:=supervise-daemon} |
| 3045 |
-: ${stdout:=/var/log/ceph/ceph} |
| 3046 |
-: ${stderr:=/var/log/ceph/ceph} |
| 3047 |
-: ${respawn_delay:=10} |
| 3048 |
-: ${respawn_max:=5} |
| 3049 |
-: ${respawn_period:=1800} |
| 3050 |
- |
| 3051 |
-: ${osd_respawn_delay:=15} |
| 3052 |
-: ${osd_respawn_max:=10} |
| 3053 |
- |
| 3054 |
-: ${radosgw_respawn_max:=5} |
| 3055 |
-: ${radosgw_respawn_period:=30} |
| 3056 |
- |
| 3057 |
-depend() { |
| 3058 |
- use dns logger |
| 3059 |
- after net ntpd ntp-client chronyd |
| 3060 |
- before netmount |
| 3061 |
-} |
| 3062 |
- |
| 3063 |
-is_type_valid() { |
| 3064 |
- case ${daemon_type} in |
| 3065 |
- mon|mds|osd|mgr|radosgw) return 0;; |
| 3066 |
- *) return 1;; |
| 3067 |
- esac |
| 3068 |
-} |
| 3069 |
- |
| 3070 |
-start_pre() { |
| 3071 |
- export CEPH_CONF="${ceph_conf}" |
| 3072 |
- |
| 3073 |
- checkpath -d -q -o "${user}:${group}" "${rundir}" |
| 3074 |
- |
| 3075 |
- if ! is_type_valid ;then |
| 3076 |
- eerror "Please give valid Ceph Server Type: mds, mon, osd" |
| 3077 |
- return 1 |
| 3078 |
- |
| 3079 |
- elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then |
| 3080 |
- eerror "${daemon_type}.${daemon_id} is still running, refusing to start" |
| 3081 |
- return 1 |
| 3082 |
- fi |
| 3083 |
- |
| 3084 |
- local arg_name arg_val |
| 3085 |
- for arg_name in std{out,err} respawn_{delay,max,period}; do |
| 3086 |
- eval arg_val="\${${daemon_type}_${arg_name}}" |
| 3087 |
- |
| 3088 |
- if [ -z "${arg_val}" ]; then |
| 3089 |
- eval arg_val="\${${arg_name}}" |
| 3090 |
- else |
| 3091 |
- eval "${arg_name}=\"${arg_val}\"" |
| 3092 |
- fi |
| 3093 |
- |
| 3094 |
- if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then |
| 3095 |
- local log_file log_postfix |
| 3096 |
- log_postfix=".${daemon_id}-${arg_name}.log" |
| 3097 |
- log_file="${arg_val}" |
| 3098 |
- |
| 3099 |
- if [ "${log_file}" != /dev/null ]; then |
| 3100 |
- log_file="${log_file}${log_postfix}" |
| 3101 |
- fi |
| 3102 |
- |
| 3103 |
- checkpath -m 0755 -o "${user}:${group}" -d $(dirname "${log_file}") |
| 3104 |
- |
| 3105 |
- supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}" |
| 3106 |
- fi |
| 3107 |
- done |
| 3108 |
-} |
| 3109 |
- |
| 3110 |
-reload() { |
| 3111 |
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" |
| 3112 |
- start-stop-daemon --signal 1 "${start_stop_daemon_args}" |
| 3113 |
- eend ${?} |
| 3114 |
-} |
| 3115 |
- |
| 3116 |
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |
| 3117 |
|
| 3118 |
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate |
| 3119 |
deleted file mode 100644 |
| 3120 |
index df03f5e..0000000 |
| 3121 |
--- a/sys-cluster/ceph/files/ceph.logrotate |
| 3122 |
+++ /dev/null |
| 3123 |
@@ -1,18 +0,0 @@ |
| 3124 |
-/var/log/ceph/*.log |
| 3125 |
-{ |
| 3126 |
- rotate 7 |
| 3127 |
- daily |
| 3128 |
- compress |
| 3129 |
- sharedscripts |
| 3130 |
- prerotate |
| 3131 |
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do |
| 3132 |
- ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null |
| 3133 |
- done |
| 3134 |
- endscript |
| 3135 |
- postrotate |
| 3136 |
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do |
| 3137 |
- ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null |
| 3138 |
- done |
| 3139 |
- endscript |
| 3140 |
- missingok |
| 3141 |
-} |
| 3142 |
|
| 3143 |
diff --git a/sys-cluster/ceph/files/ceph.logrotate-r1 b/sys-cluster/ceph/files/ceph.logrotate-r1 |
| 3144 |
deleted file mode 100644 |
| 3145 |
index df03f5e..0000000 |
| 3146 |
--- a/sys-cluster/ceph/files/ceph.logrotate-r1 |
| 3147 |
+++ /dev/null |
| 3148 |
@@ -1,18 +0,0 @@ |
| 3149 |
-/var/log/ceph/*.log |
| 3150 |
-{ |
| 3151 |
- rotate 7 |
| 3152 |
- daily |
| 3153 |
- compress |
| 3154 |
- sharedscripts |
| 3155 |
- prerotate |
| 3156 |
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do |
| 3157 |
- ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null |
| 3158 |
- done |
| 3159 |
- endscript |
| 3160 |
- postrotate |
| 3161 |
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do |
| 3162 |
- ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null |
| 3163 |
- done |
| 3164 |
- endscript |
| 3165 |
- missingok |
| 3166 |
-} |
| 3167 |
|
| 3168 |
diff --git a/sys-cluster/ceph/files/ceph.logrotate-r2 b/sys-cluster/ceph/files/ceph.logrotate-r2 |
| 3169 |
deleted file mode 100644 |
| 3170 |
index 74d96e2..0000000 |
| 3171 |
--- a/sys-cluster/ceph/files/ceph.logrotate-r2 |
| 3172 |
+++ /dev/null |
| 3173 |
@@ -1,33 +0,0 @@ |
| 3174 |
-# |
| 3175 |
-# /etc/logrotate.d/ceph |
| 3176 |
-# |
| 3177 |
- |
| 3178 |
-/var/log/ceph/*.log |
| 3179 |
-{ |
| 3180 |
- rotate 7 |
| 3181 |
- daily |
| 3182 |
- compress |
| 3183 |
- sharedscripts |
| 3184 |
- prerotate |
| 3185 |
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do |
| 3186 |
- ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null |
| 3187 |
- done |
| 3188 |
- endscript |
| 3189 |
- postrotate |
| 3190 |
- for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do |
| 3191 |
- ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null |
| 3192 |
- done |
| 3193 |
- endscript |
| 3194 |
- missingok |
| 3195 |
-} |
| 3196 |
- |
| 3197 |
-/var/log/ceph/console/*.log |
| 3198 |
-{ |
| 3199 |
- rotate 7 |
| 3200 |
- daily |
| 3201 |
- compress |
| 3202 |
- missingok |
| 3203 |
- copytruncate |
| 3204 |
-} |
| 3205 |
-# |
| 3206 |
-# vim:ft=conf:ts=4:sts=4:sw=4:noet: |
| 3207 |
|
| 3208 |
diff --git a/sys-cluster/ceph/files/envd-tcmalloc b/sys-cluster/ceph/files/envd-tcmalloc |
| 3209 |
deleted file mode 100644 |
| 3210 |
index bdb0967..0000000 |
| 3211 |
--- a/sys-cluster/ceph/files/envd-tcmalloc |
| 3212 |
+++ /dev/null |
| 3213 |
@@ -1 +0,0 @@ |
| 3214 |
-TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=134217728 |
| 3215 |
|
| 3216 |
diff --git a/sys-cluster/ceph/files/make-node-frontend-tarball.bash b/sys-cluster/ceph/files/make-node-frontend-tarball.bash |
| 3217 |
deleted file mode 100644 |
| 3218 |
index 0a8015f..0000000 |
| 3219 |
--- a/sys-cluster/ceph/files/make-node-frontend-tarball.bash |
| 3220 |
+++ /dev/null |
| 3221 |
@@ -1,140 +0,0 @@ |
| 3222 |
-#!/bin/bash |
| 3223 |
- |
| 3224 |
-frontend_path="src/pybind/mgr/dashboard/frontend" |
| 3225 |
-node_dir="node_modules" |
| 3226 |
-output_name_format="ceph-%s-frontend-node-modules.tar.xz" |
| 3227 |
-cache_dir_format="ceph-%s-npm-cache" |
| 3228 |
- |
| 3229 |
-# regexes for modules to remove |
| 3230 |
-remove_modules=( |
| 3231 |
- "^karma.*" |
| 3232 |
- "^jasmine.*" |
| 3233 |
- ".+/jasmine.*" |
| 3234 |
- "^tslint.*" |
| 3235 |
- "^codelyzer" |
| 3236 |
- "^protractor" |
| 3237 |
- "^ts-node" |
| 3238 |
-) |
| 3239 |
- |
| 3240 |
-# location to find dependencies to prune |
| 3241 |
-node_dep_location="devDependencies" |
| 3242 |
- |
| 3243 |
-# node package files |
| 3244 |
-node_package_file="package.json" |
| 3245 |
-node_package_lock="package-lock.json" |
| 3246 |
- |
| 3247 |
-# system commands needed |
| 3248 |
-dependencies=( |
| 3249 |
- wget |
| 3250 |
- git |
| 3251 |
- gzip |
| 3252 |
- jq |
| 3253 |
- tar |
| 3254 |
- xz |
| 3255 |
-) |
| 3256 |
- |
| 3257 |
-check_deps() { |
| 3258 |
- local dep |
| 3259 |
- |
| 3260 |
- for dep in "${dependencies[@]}"; do |
| 3261 |
- if ! command -v "${dep}" >/dev/null; then |
| 3262 |
- printf '%s: ERROR could not find required command "%s"\n' "${appname}" "${dep}" >&2 |
| 3263 |
- exit 1 |
| 3264 |
- fi |
| 3265 |
- done |
| 3266 |
- |
| 3267 |
- # make sure that jq was compiled with support for regexes |
| 3268 |
- if ! jq -c 'map( select(. | test("TEST"; "i")))' <<< '{"TEST": "TEST"}' >/dev/null; then |
| 3269 |
- printf '%s: ERROR: jq does not support regular expressions, make sure the "oniguruma" USE flag is enabled\n' \ |
| 3270 |
- "${appname}" |
| 3271 |
- exit 1 |
| 3272 |
- fi |
| 3273 |
- : |
| 3274 |
-} |
| 3275 |
- |
| 3276 |
-get_npm_packages() { |
| 3277 |
- local tempfile jq_regex full_cache_dir |
| 3278 |
- |
| 3279 |
- full_cache_dir="${PWD}/${cache_dir}" |
| 3280 |
- |
| 3281 |
- pushd "${source_path}/${frontend_path}" > /dev/null |
| 3282 |
- if [[ ! -r "${node_package_file}" ]]; then |
| 3283 |
- printf '%s: ERROR: could not find "%s" in "%s"\n' "${appname}" \ |
| 3284 |
- "${node_package_file}" "${frontend_path}" |
| 3285 |
- exit 1 |
| 3286 |
- fi |
| 3287 |
- |
| 3288 |
- tempfile="$(TMPDIR="." mktemp packages-XXXXX.json)" |
| 3289 |
- |
| 3290 |
- jq_regex="$(printf "%s|" "${remove_modules[@]}")" |
| 3291 |
- |
| 3292 |
- # filter out test only deps that pull in precompiled binaries |
| 3293 |
- # shellcheck disable=SC2031 |
| 3294 |
- jq --monochrome-output --raw-output --exit-status \ |
| 3295 |
- '."'"${node_dep_location}"'"|=with_entries(select(.key|test("('"${jq_regex%|}"')")|not))' \ |
| 3296 |
- "${node_package_file}" > "${tempfile}" |
| 3297 |
- |
| 3298 |
- # make sure output is still valid JSON |
| 3299 |
- jq . --exit-status "${tempfile}" > /dev/null |
| 3300 |
- |
| 3301 |
- mv "${tempfile}" "${node_package_file}" |
| 3302 |
- |
| 3303 |
- rm -rf "${full_cache_dir:?}" "${node_dir:?}" "${node_package_lock:?}" |
| 3304 |
- |
| 3305 |
- npm install --ignore-scripts --cache="${full_cache_dir}" |
| 3306 |
- |
| 3307 |
- popd >/dev/null |
| 3308 |
-} |
| 3309 |
- |
| 3310 |
-main() { |
| 3311 |
- local appname source_path version cache_dir |
| 3312 |
- |
| 3313 |
- set -e |
| 3314 |
- set -o pipefail |
| 3315 |
- shopt -s nullglob |
| 3316 |
- |
| 3317 |
- appname=$(basename "${0}") |
| 3318 |
- source_path="${1}" |
| 3319 |
- version="${2}" |
| 3320 |
- |
| 3321 |
- if [[ -z ${source_path} || -z ${version} ]]; then |
| 3322 |
- printf 'Syntax: %s <source directory> <version>\n' "${appname}" >&2 |
| 3323 |
- return 1 |
| 3324 |
- |
| 3325 |
- elif [[ ! -d ${source_path} ]]; then |
| 3326 |
- printf '%s: ERROR: Not a directory: %s\n' "${appname}" "${source_path}" |
| 3327 |
- return 1 |
| 3328 |
- fi |
| 3329 |
- |
| 3330 |
- check_deps |
| 3331 |
- |
| 3332 |
- # shellcheck disable=SC2059 |
| 3333 |
- cache_dir="$(printf -- "${cache_dir_format}\\n" "${version}")" |
| 3334 |
- |
| 3335 |
- get_npm_packages |
| 3336 |
- pack_tarball |
| 3337 |
-} |
| 3338 |
- |
| 3339 |
-pack_tarball() { |
| 3340 |
- local output |
| 3341 |
- |
| 3342 |
- # shellcheck disable=SC2059 |
| 3343 |
- output="$(printf -- "${output_name_format}\\n" "${version}")" |
| 3344 |
- |
| 3345 |
- tar caf "${output}" \ |
| 3346 |
- --numeric-owner \ |
| 3347 |
- --anchored \ |
| 3348 |
- --owner="root:0" \ |
| 3349 |
- --group="root:0" \ |
| 3350 |
- --exclude-vcs \ |
| 3351 |
- --transform="s:^${source_path}/:ceph-${version}/:" \ |
| 3352 |
- "${cache_dir}" \ |
| 3353 |
- "${source_path}/${frontend_path}/${node_package_file}" \ |
| 3354 |
- "${source_path}/${frontend_path}/${node_package_lock}" |
| 3355 |
- |
| 3356 |
- printf '%s: Output written to "%s"\n' "${appname}" "${output}" |
| 3357 |
-} |
| 3358 |
- |
| 3359 |
-main "${@}" |
| 3360 |
- |
| 3361 |
-# vim:ft=sh:noet:ts=4:sts=4:sw=4: |
| 3362 |
|
| 3363 |
diff --git a/sys-cluster/ceph/files/rbdmap.initd b/sys-cluster/ceph/files/rbdmap.initd |
| 3364 |
deleted file mode 100644 |
| 3365 |
index 9313cf6..0000000 |
| 3366 |
--- a/sys-cluster/ceph/files/rbdmap.initd |
| 3367 |
+++ /dev/null |
| 3368 |
@@ -1,122 +0,0 @@ |
| 3369 |
-#!/sbin/openrc-run |
| 3370 |
- |
| 3371 |
-DESC="RBD Mapping:" |
| 3372 |
-RBDMAPFILE="/etc/ceph/rbdmap" |
| 3373 |
- |
| 3374 |
-extra_started_commands="reload" |
| 3375 |
- |
| 3376 |
-depend() { |
| 3377 |
- need localmount net |
| 3378 |
- before netmount |
| 3379 |
-} |
| 3380 |
- |
| 3381 |
-start() { |
| 3382 |
- |
| 3383 |
- if [ ! -f "${RBDMAPFILE}" ]; then |
| 3384 |
- ewarn "$DESC : No ${RBDMAPFILE} found." |
| 3385 |
- exit 0 |
| 3386 |
- fi |
| 3387 |
- |
| 3388 |
- RET=0 |
| 3389 |
- # Read /etc/ceph/rbdmap to create non-existant mapping |
| 3390 |
- while read DEV PARAMS; do |
| 3391 |
- case "$DEV" in |
| 3392 |
- ""|\#*) |
| 3393 |
- continue |
| 3394 |
- ;; |
| 3395 |
- */*) |
| 3396 |
- ;; |
| 3397 |
- *) |
| 3398 |
- DEV=rbd/$DEV |
| 3399 |
- ;; |
| 3400 |
- esac |
| 3401 |
- ebegin "${DESC} '${DEV}'" |
| 3402 |
- newrbd="" |
| 3403 |
- MAP_RV="" |
| 3404 |
- RET_OP=0 |
| 3405 |
- OIFS=$IFS |
| 3406 |
- IFS=',' |
| 3407 |
- for PARAM in ${PARAMS[@]}; do |
| 3408 |
- CMDPARAMS="${CMDPARAMS} --$(echo ${PARAM} | tr '=' ' ')" |
| 3409 |
- done |
| 3410 |
- IFS=$OIFS |
| 3411 |
- if [ ! -b /dev/rbd/${DEV} ]; then |
| 3412 |
- MAP_RV=$(rbd map ${DEV} ${CMDPARAMS} 2>&1) |
| 3413 |
- if [ $? -eq 0 ]; then |
| 3414 |
- newrbd="yes" |
| 3415 |
- else |
| 3416 |
- RET=$((${RET}+$?)) |
| 3417 |
- RET_OP=1 |
| 3418 |
- fi |
| 3419 |
- fi |
| 3420 |
- eend ${RET_OP} "${MAP_RV}" |
| 3421 |
- |
| 3422 |
- if [ "$newrbd" ]; then |
| 3423 |
- ## Mount new rbd |
| 3424 |
- MNT_RV="" |
| 3425 |
- mount --fake /dev/rbd/${DEV} >>/dev/null 2>&1 \ |
| 3426 |
- && MNT_RV=$(mount -vn /dev/rbd/${DEV} 2>&1) |
| 3427 |
- [ -n "${MNT_RV}" ] && einfo "mount: ${MNT_RV}" |
| 3428 |
- |
| 3429 |
- ## post-mapping |
| 3430 |
- if [ -x "/etc/ceph/rbd.d/${DEV}" ]; then |
| 3431 |
- einfo "RBD Running post-map hook '/etc/ceph/rbd.d/${DEV}'" |
| 3432 |
- /etc/ceph/rbd.d/${DEV} map "/dev/rbd/${DEV}" |
| 3433 |
- fi |
| 3434 |
- fi |
| 3435 |
- done < ${RBDMAPFILE} |
| 3436 |
- eend ${RET} |
| 3437 |
-} |
| 3438 |
- |
| 3439 |
-stop() { |
| 3440 |
- |
| 3441 |
- RET=0 |
| 3442 |
- ## Unmount and unmap all rbd devices |
| 3443 |
- if ls /dev/rbd[0-9]* >/dev/null 2>&1; then |
| 3444 |
- for DEV in /dev/rbd[0-9]*; do |
| 3445 |
- ## pre-unmapping |
| 3446 |
- for L in $(find /dev/rbd -type l); do |
| 3447 |
- LL="${L##/dev/rbd/}" |
| 3448 |
- if [ "$(readlink -f $L)" = "${DEV}" ] \ |
| 3449 |
- && [ -x "/etc/ceph/rbd.d/${LL}" ]; then |
| 3450 |
- einfo "RBD pre-unmap: '${DEV}' hook '/etc/ceph/rbd.d/${LL}'" |
| 3451 |
- /etc/ceph/rbd.d/${LL} unmap "$L" |
| 3452 |
- break |
| 3453 |
- fi |
| 3454 |
- done |
| 3455 |
- |
| 3456 |
- ebegin "Unmapping RBD device: '${DEV}'" |
| 3457 |
- UMNT_RV="" |
| 3458 |
- UMAP_RV="" |
| 3459 |
- RET_OP=0 |
| 3460 |
- MNT=$(findmnt --mtab --source ${DEV} --noheadings | awk '{print $1'}) |
| 3461 |
- if [ -n "${MNT}" ]; then |
| 3462 |
- einfo "un-mounting '${MNT}'" |
| 3463 |
- UMNT_RV=$(umount "${MNT}" 2>&1) |
| 3464 |
- fi |
| 3465 |
- if mountpoint -q "${MNT}"; then |
| 3466 |
- ## Un-mounting failed. |
| 3467 |
- RET_OP=1 |
| 3468 |
- RET=$((${RET}+1)) |
| 3469 |
- else |
| 3470 |
- ## Un-mapping. |
| 3471 |
- UMAP_RV=$(rbd unmap $DEV 2>&1) |
| 3472 |
- if [ $? -ne 0 ]; then |
| 3473 |
- RET=$((${RET}+$?)) |
| 3474 |
- RET_OP=1 |
| 3475 |
- fi |
| 3476 |
- fi |
| 3477 |
- eend ${RET_OP} "${UMAP_RV}" |
| 3478 |
- [ -n "${UMNT_RV}" ] && einfo "${UMNT_RV}" |
| 3479 |
- done |
| 3480 |
- fi |
| 3481 |
- eend ${RET} |
| 3482 |
-} |
| 3483 |
- |
| 3484 |
-reload() { |
| 3485 |
- start |
| 3486 |
-} |
| 3487 |
- |
| 3488 |
-status() { |
| 3489 |
- rbd showmapped |
| 3490 |
-} |
| 3491 |
|
| 3492 |
diff --git a/sys-cluster/ceph/files/sysctld b/sys-cluster/ceph/files/sysctld |
| 3493 |
deleted file mode 100644 |
| 3494 |
index 4d13326..0000000 |
| 3495 |
--- a/sys-cluster/ceph/files/sysctld |
| 3496 |
+++ /dev/null |
| 3497 |
@@ -1,2 +0,0 @@ |
| 3498 |
-# up the global pid max for ceph |
| 3499 |
-kernel.pid_max = 257256 |
| 3500 |
|
| 3501 |
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml |
| 3502 |
deleted file mode 100644 |
| 3503 |
index 500b105..0000000 |
| 3504 |
--- a/sys-cluster/ceph/metadata.xml |
| 3505 |
+++ /dev/null |
| 3506 |
@@ -1,31 +0,0 @@ |
| 3507 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 3508 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 3509 |
-<pkgmetadata> |
| 3510 |
- <maintainer type="person"> |
| 3511 |
- <email>chutzpah@g.o</email> |
| 3512 |
- <name>Patrick McLean</name> |
| 3513 |
- </maintainer> |
| 3514 |
- <maintainer type="person"> |
| 3515 |
- <email>dlan@g.o</email> |
| 3516 |
- <name>Yixun Lan</name> |
| 3517 |
- </maintainer> |
| 3518 |
- <maintainer type="project"> |
| 3519 |
- <email>cluster@g.o</email> |
| 3520 |
- <name>Gentoo Cluster Project</name> |
| 3521 |
- </maintainer> |
| 3522 |
- <longdescription> |
| 3523 |
- Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. |
| 3524 |
- </longdescription> |
| 3525 |
- <use> |
| 3526 |
- <flag name="babeltrace">Add support for LTTng babeltrace</flag> |
| 3527 |
- <flag name="cephfs">Build support for cephfs, a POSIX compatible filesystem built on top of ceph</flag> |
| 3528 |
- <flag name="fuse">Build fuse client</flag> |
| 3529 |
- <flag name="lttng">Add support for LTTng</flag> |
| 3530 |
- <flag name="mgr">Build the ceph-mgr daemon</flag> |
| 3531 |
- <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag> |
| 3532 |
- <flag name="radosgw">Add radosgw support</flag> |
| 3533 |
- <flag name="system-boost">Use system <pkg>dev-libs/boost</pkg> instead of the bundled one</flag> |
| 3534 |
- <flag name="xfs">Add xfs support</flag> |
| 3535 |
- <flag name="zfs">Add zfs support</flag> |
| 3536 |
- </use> |
| 3537 |
-</pkgmetadata> |
Archives