diff options
| -rw-r--r-- | sys-cluster/ceph/Manifest | 1 | ||||
| -rw-r--r-- | sys-cluster/ceph/ceph-14.2.1.ebuild | 362 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch | 321 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch | 120 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph.initd-r12 | 115 |
5 files changed, 919 insertions, 0 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index bfbbc7b64d73..4c6e42c016ed 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -3,3 +3,4 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8 DIST ceph-14.2.0.tar.gz 118882504 BLAKE2B e650d99dceb11c7b035480c8cdd9f63ee4a5f81ffea27988e180a2956433e3e4b34e496a73bf5992c428eff859311c623b92a6f006eb694ebf928d8204dc9b06 SHA512 c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480 +DIST ceph-14.2.1.tar.gz 117111511 BLAKE2B c00181223c6e02e7fe696ed4226f1751eca48e799f8b5377a06621eb3300f81b58dc20f325b455df04fcbd0c28b981fae1cfc778a8d69414247ddd206d0c6175 SHA512 fccde341344c721fbfc7f7cb73db4f65933d7fcacc9495398b55b37d1e208f0bad0cd78a4da08a3b5e26cca3175e7707f7dfb76fae5aa094f58afaed8603c866 diff --git a/sys-cluster/ceph/ceph-14.2.1.ebuild b/sys-cluster/ceph/ceph-14.2.1.ebuild new file mode 100644 index 000000000000..6cab06ebd9c3 --- /dev/null +++ b/sys-cluster/ceph/ceph-14.2.1.ebuild @@ -0,0 +1,362 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +DISTUTILS_OPTIONAL=1 + +inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ + multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ + systemd + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ceph/ceph.git" + SRC_URI="" +else + SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="https://ceph.com/" + +LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" +SLOT="0" + +CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) + +IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" +IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" +IUSE+=" systemd +tcmalloc test xfs zfs" +IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +COMMON_DEPEND=" + virtual/libudev:= + app-arch/bzip2:=[static-libs?] + app-arch/lz4:=[static-libs?] + app-arch/snappy:=[static-libs?] + app-arch/zstd:=[static-libs?] + app-misc/jq:=[static-libs?] + dev-libs/crypto++:=[static-libs?] + dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] + dev-libs/libaio:=[static-libs?] + dev-libs/libxml2:=[static-libs?] + dev-libs/nss:= + sys-auth/oath-toolkit:= + sys-apps/keyutils:=[static-libs?] + sys-apps/util-linux:=[static-libs?] + sys-libs/ncurses:0=[static-libs?] + sys-libs/zlib:=[static-libs?] + babeltrace? ( dev-util/babeltrace ) + ldap? ( net-nds/openldap:=[static-libs?] ) + lttng? ( dev-util/lttng-ust:= ) + fuse? ( sys-fs/fuse:0=[static-libs?] ) + kerberos? ( virtual/krb5 ) + rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) + ssl? ( + !libressl? ( dev-libs/openssl:=[static-libs?] ) + libressl? ( dev-libs/libressl:=[static-libs?] ) + ) + xfs? ( sys-fs/xfsprogs:=[static-libs?] ) + zfs? ( sys-fs/zfs:=[static-libs?] ) + radosgw? ( + dev-libs/expat:=[static-libs?] + !libressl? ( + dev-libs/openssl:=[static-libs?] + net-misc/curl:=[curl_ssl_openssl,static-libs?] + ) + libressl? ( + dev-libs/libressl:=[static-libs?] + net-misc/curl:=[curl_ssl_libressl,static-libs?] + ) + ) + system-boost? ( + || ( + ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ) + dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ) + jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) + !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) + ${PYTHON_DEPS} + " +DEPEND="${COMMON_DEPEND} + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) + dev-python/cython[${PYTHON_USEDEP}] + dev-python/sphinx + dev-util/cunit + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + sys-apps/grep[pcre] + sys-fs/btrfs-progs + ) + " +BDEPEND=" app-arch/cpio + >=dev-util/cmake-3.5.0 + dev-util/gperf + dev-util/valgrind + sys-apps/which + sys-devel/bc + virtual/pkgconfig + " +RDEPEND="${COMMON_DEPEND} + net-misc/socat + sys-apps/gptfdisk + sys-block/parted + sys-fs/cryptsetup + sys-fs/lvm2[-device-mapper-only(-)] + !<sys-apps/openrc-0.26.3 + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pecan[${PYTHON_USEDEP}] + dev-python/prettytable[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/werkzeug[${PYTHON_USEDEP}] + " +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + || ( $(python_gen_useflags 'python3*') ) + ?? ( jemalloc tcmalloc ) + rabbitmq? ( radosgw ) + " + +# the tests need root access +RESTRICT="test? ( userpriv )" + +# distribution tarball does not include everything needed for tests +RESTRICT+=" test" + +# false positives unless all USE flags are on +CMAKE_WARN_UNUSED_CLI="no" + +UNBUNDLE_LIBS=( + src/erasure-code/jerasure/jerasure + src/erasure-code/jerasure/gf-complete +) + +PATCHES=( + "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" + "${FILESDIR}/ceph-14.2.0-cflags.patch" + "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" + "${FILESDIR}/ceph-13.2.0-cflags.patch" + "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch" + "${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch" + "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" + "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" + "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch" + "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" + "${FILESDIR}/ceph-14.2.1-ncurses-tinfo.patch" +) + +# dpdk and ninja don't get along +CMAKE_MAKEFILE_GENERATOR="emake" + +check-reqs_export_vars() { + if use amd64; then + CHECKREQS_DISK_BUILD="12G" + CHECKREQS_DISK_USR="460M" + else + CHECKREQS_DISK_BUILD="1400M" + CHECKREQS_DISK_USR="450M" + fi + + export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR +} + +user_setup() { + enewgroup ceph ${CEPH_GID} + enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph +} + +pkg_pretend() { + check-reqs_export_vars + check-reqs_pkg_pretend + + if use system-boost && has_version '~dev-libs/boost-1.70.0'; then + ewarn "Building with boost-1.70 is experimental, and may cause runtime" + ewarn "failures. Disable the system-boost USE flag to use bundled boost" + ewarn "if you want an upstream supported configuration." + fi +} + +pkg_setup() { + python_setup 'python3*' + check-reqs_export_vars + check-reqs_pkg_setup + user_setup +} + +src_prepare() { + cmake-utils_src_prepare + + if use system-boost; then + if has_version '~dev-libs/boost-1.70.0'; then + eapply "${FILESDIR}/ceph-14.2.0-boost-1.70-sonames.patch" \ + "${FILESDIR}/ceph-14.2.0-boost-1.70.patch" + else + eapply "${FILESDIR}/ceph-14.2.0-boost-sonames.patch" + fi + fi + + sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ + src/bash_completion/CMakeLists.txt || die + + # remove tests that need root access + rm src/test/cli/ceph-authtool/cap*.t || die +} + +ceph_src_configure() { + local flag + local mycmakeargs=( + -DWITH_BABELTRACE=$(usex babeltrace) + -DWITH_CEPHFS=$(usex cephfs) + -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi) + -DWITH_DPDK=$(usex dpdk) + -DWITH_FUSE=$(usex fuse) + -DWITH_LTTNG=$(usex lttng) + -DWITH_GSSAPI=$(usex kerberos) + -DWITH_GRAFANA=$(usex grafana) + -DWITH_MGR=$(usex mgr) + -DWITH_MGR_DASHBOARD_FRONTEND=NO + -DWITH_NUMA=$(usex numa) + -DWITH_OPENLDAP=$(usex ldap) + -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi) + -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi) + -DWITH_RADOSGW=$(usex radosgw) + -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) + -DWITH_SSL=$(usex ssl) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TESTS=$(usex test) + -DWITH_XFS=$(usex xfs) + -DWITH_ZFS=$(usex zfs) + -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF') + -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") + -DWITH_SYSTEM_BOOST=$(usex system-boost) + -DBOOST_J=$(makeopts_jobs) + -DWITH_RDMA=no + -DWITH_TBB=no + -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) + -DEPYTHON_VERSION="${EPYTHON#python}" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + #-Wno-dev + ) + if use amd64 || use x86; then + for flag in ${CPU_FLAGS_X86[@]}; do + mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") + done + fi + + rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ + || die "failed to remove cmake cache" + + cmake-utils_src_configure + + # bug #630232 + sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ + "${BUILD_DIR:-${S}}"/include/acconfig.h \ + || die "sed failed" +} + +src_configure() { + ceph_src_configure +} + +python_compile() { + local CMAKE_USE_DIR="${S}" + ceph_src_configure + + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + emake VERBOSE=1 clean + emake VERBOSE=1 all + + # python modules are only compiled with "make install" so we need to do this to + # prevent doing a bunch of compilation in src_install + DESTDIR="${T}" emake VERBOSE=1 install + popd >/dev/null || die +} + +src_compile() { + cmake-utils_src_make VERBOSE=1 all + + # we have to do this here to prevent from building everything multiple times + python_copy_sources + python_foreach_impl python_compile +} + +src_test() { + make check || die "make check failed" +} + +python_install() { + local CMAKE_USE_DIR="${S}" + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + DESTDIR="${ED}" emake VERBOSE=1 install + popd >/dev/null || die +} + +src_install() { + cmake-utils_src_install + python_foreach_impl python_install + + find "${ED}" -name '*.la' -type f -delete || die + + exeinto /usr/$(get_libdir)/ceph + newexe "${BUILD_DIR}/bin/init-ceph" init-ceph + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} + + keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat + + fowners -R ceph:ceph /var/lib/ceph /var/log/ceph + + newinitd "${FILESDIR}/rbdmap.initd" rbdmap + newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} + + insinto /etc/sysctl.d + newins "${FILESDIR}"/sysctld 90-${PN}.conf + + use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc + + # units aren't installed by the build system unless systemd is enabled + # so no point installing these with the USE flag disabled + if use systemd; then + systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ + "ceph-mds@.service" + + systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ + "ceph-osd@.service" + fi + + udev_dorules udev/*.rules + + readme.gentoo_create_doc + + python_setup 'python3*' + + # bug #630232 + sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ + || die "sed failed" + + python_fix_shebang "${ED}"/usr/{,s}bin/ + + # python_fix_shebang apparently is not idempotent + sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ + "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" + + local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${ED}}" +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch new file mode 100644 index 000000000000..6d7120037424 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch @@ -0,0 +1,321 @@ +diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake +index bfab4ca436..90ed0cbb17 100644 +--- a/cmake/modules/FindBoost.cmake ++++ b/cmake/modules/FindBoost.cmake +@@ -1181,10 +1181,10 @@ endif() + # on all platforms to keep end user code free from platform dependent + # code. Also provide convenience targets to disable autolinking and + # enable dynamic linking. +-if(NOT TARGET Boost::diagnostic_definitions) +- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) +- add_library(Boost::disable_autolinking INTERFACE IMPORTED) +- add_library(Boost::dynamic_linking INTERFACE IMPORTED) ++if(NOT TARGET boost_diagnostic_definitions) ++ add_library(boost_diagnostic_definitions INTERFACE IMPORTED) ++ add_library(boost_disable_autolinking INTERFACE IMPORTED) ++ add_library(boost_dynamic_linking INTERFACE IMPORTED) + endif() + if(WIN32) + # In windows, automatic linking is performed, so you do not have +@@ -1205,11 +1205,11 @@ if(WIN32) + # code to emit a #pragma message each time a library is selected + # for linking. + set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") +- set_target_properties(Boost::diagnostic_definitions PROPERTIES ++ set_target_properties(boost_diagnostic_definitions PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") +- set_target_properties(Boost::disable_autolinking PROPERTIES ++ set_target_properties(boost_disable_autolinking PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") +- set_target_properties(Boost::dynamic_linking PROPERTIES ++ set_target_properties(boost_dynamic_linking PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") + endif() + +@@ -2018,52 +2018,52 @@ if(Boost_FOUND) + endif() + + foreach(COMPONENT ${Boost_FIND_COMPONENTS}) +- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) ++ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + if(Boost_${UPPERCOMPONENT}_FOUND) + if(Boost_USE_STATIC_LIBS) +- add_library(Boost::${COMPONENT} STATIC IMPORTED) ++ add_library(boost_${COMPONENT} STATIC IMPORTED) + else() + # Even if Boost_USE_STATIC_LIBS is OFF, we might have static + # libraries as a result. +- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) ++ add_library(boost_${COMPONENT} UNKNOWN IMPORTED) + endif() + if(Boost_INCLUDE_DIRS) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}") +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" + IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") +- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY ++ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" + IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") +- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY ++ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" + IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") + endif() + if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) + unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) + foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES}) +- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep}) ++ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep}) + endforeach() + if(COMPONENT STREQUAL "thread") + list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads) + endif() +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}") + endif() + if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}") + endif() + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1b1f19d464..21c222280f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -353,12 +353,12 @@ set(ceph_common_objs + set(ceph_common_deps + json_spirit erasure_code arch crc32 + ${LIB_RESOLV} +- Boost::thread +- Boost::system +- Boost::random +- Boost::program_options +- Boost::date_time +- Boost::iostreams ++ boost_thread ++ boost_system ++ boost_random ++ boost_program_options ++ boost_date_time ++ boost_iostreams + ${BLKID_LIBRARIES} + ${Backtrace_LIBRARIES} + ${BLKIN_LIBRARIES} +@@ -518,7 +518,7 @@ if (WITH_CEPHFS) + ceph_mds.cc) + add_executable(ceph-mds ${ceph_mds_srcs}) + target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common +- Boost::thread) ++ boost_thread) + install(TARGETS ceph-mds DESTINATION bin) + endif() + +diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt +index d7b58521d4..e1533af33f 100644 +--- a/src/crimson/CMakeLists.txt ++++ b/src/crimson/CMakeLists.txt +@@ -106,8 +106,8 @@ target_link_libraries(crimson-common + PRIVATE + crc32 + crimson::cflags +- Boost::iostreams +- Boost::random ++ boost_iostreams ++ boost_random + ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto) + + set(crimson_auth_srcs +diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt +index 252fb3e5e3..213482da16 100644 +--- a/src/mgr/CMakeLists.txt ++++ b/src/mgr/CMakeLists.txt +@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") + target_link_libraries(ceph-mgr + osdc client heap_profiler + global-static ceph-common +- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} ++ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} + ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) + set_target_properties(ceph-mgr PROPERTIES + POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) +diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt +index e9d3804c5f..5c6eb58de1 100644 +--- a/src/rbd_replay/CMakeLists.txt ++++ b/src/rbd_replay/CMakeLists.txt +@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) + global + babeltrace + babeltrace-ctf +- Boost::date_time ++ boost_date_time + ) + install(TARGETS rbd-replay-prep DESTINATION bin) + endif(HAVE_BABELTRACE) +diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt +index ccc4f74cfe..854aa6e5e9 100644 +--- a/src/rgw/CMakeLists.txt ++++ b/src/rgw/CMakeLists.txt +@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL) + endif() + + if(WITH_BOOST_CONTEXT) +- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) ++ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context) + endif() + + set(rgw_libs rgw_a) +@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT) + target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ) + endif() + if(WITH_BOOST_CONTEXT) +- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) ++ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context) + endif() + + if(WITH_TESTS) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 20a64fd41b..a8bb323614 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -158,7 +158,7 @@ add_executable(ceph_omapbench + ) + target_link_libraries(ceph_omapbench + librados +- Boost::program_options ++ boost_program_options + global + ${BLKID_LIBRARIES} + ${CMAKE_DL_LIBS} +diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt +index 71fb77cda9..aff8fb6565 100644 +--- a/src/test/common/CMakeLists.txt ++++ b/src/test/common/CMakeLists.txt +@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject) + + add_executable(unittest_async_completion test_async_completion.cc) + add_ceph_unittest(unittest_async_completion) +-target_link_libraries(unittest_async_completion Boost::system) ++target_link_libraries(unittest_async_completion boost_system) + + add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) + add_ceph_unittest(unittest_async_shared_mutex) +-target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) ++target_link_libraries(unittest_async_shared_mutex ceph-common boost_system) +diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt +index 721f6c3675..1cd9635c77 100644 +--- a/src/test/erasure-code/CMakeLists.txt ++++ b/src/test/erasure-code/CMakeLists.txt +@@ -2,15 +2,15 @@ + add_executable(ceph_erasure_code_benchmark + ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc + ceph_erasure_code_benchmark.cc) +-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + install(TARGETS ceph_erasure_code_benchmark + DESTINATION bin) + + add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) +-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + + add_executable(ceph_erasure_code ceph_erasure_code.cc) +-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + install(TARGETS ceph_erasure_code + DESTINATION bin) + +diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt +index 4fc53d2406..e6304394f8 100644 +--- a/src/test/librados/CMakeLists.txt ++++ b/src/test/librados/CMakeLists.txt +@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc) + target_link_libraries(ceph_test_rados_api_asio global + librados ${UNITTEST_LIBS}) + if(WITH_BOOST_CONTEXT) +- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) ++ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) + endif() + + add_executable(ceph_test_rados_api_list +@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp + tier_cxx.cc + $<TARGET_OBJECTS:unit-main>) + target_link_libraries(ceph_test_rados_api_tier_pp +- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) ++ librados global ${UNITTEST_LIBS} boost_system radostest-cxx) + + add_executable(ceph_test_rados_api_snapshots + snapshots.cc) +diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt +index 2bf6723c40..e99b8afa11 100644 +--- a/src/test/librbd/CMakeLists.txt ++++ b/src/test/librbd/CMakeLists.txt +@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE + radostest + radostest-cxx + librados +- Boost::thread ++ boost_thread + GMock::GMock + GTest::GTest) + +diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt +index 9b2c6b6321..80e4cb7829 100644 +--- a/src/test/rgw/CMakeLists.txt ++++ b/src/test/rgw/CMakeLists.txt +@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler) + target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock) + if(WITH_BOOST_CONTEXT) + target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) +- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) ++ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context) + endif() + + if(WITH_RADOSGW_AMQP_ENDPOINT) +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index d31f3d2408..6945018b11 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -35,20 +35,20 @@ install(PROGRAMS + endif(WITH_TESTS) + + add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) +-target_link_libraries(ceph-osdomap-tool os global Boost::program_options) ++target_link_libraries(ceph-osdomap-tool os global boost_program_options) + install(TARGETS ceph-osdomap-tool DESTINATION bin) + + add_executable(ceph-monstore-tool + ceph_monstore_tool.cc + ../mgr/mgr_commands.cc) +-target_link_libraries(ceph-monstore-tool os global Boost::program_options) ++target_link_libraries(ceph-monstore-tool os global boost_program_options) + install(TARGETS ceph-monstore-tool DESTINATION bin) + + add_executable(ceph-objectstore-tool + ceph_objectstore_tool.cc + rebuild_mondb.cc + RadosDump.cc) +-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) + if(WITH_FUSE) + target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES}) + endif(WITH_FUSE) diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch new file mode 100644 index 000000000000..ce2ee92b3d8e --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch @@ -0,0 +1,120 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f97f96b5bf..f5e5d06d35 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -657,13 +657,13 @@ if(WITH_SYSTEM_BOOST) + if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE) + set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}") + endif() +- find_package(Boost 1.67 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) ++ find_package(Boost 1.70 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) + else() + set(BOOST_J 1 CACHE STRING + "max jobs for Boost build") # override w/-DBOOST_J=<n> + set(Boost_USE_STATIC_LIBS ON) + include(BuildBoost) +- build_boost(1.67 ++ build_boost(1.70 + COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS}) + endif() + include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS}) +diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake +index f46cc0d485..4254508570 100644 +--- a/cmake/modules/BuildBoost.cmake ++++ b/cmake/modules/BuildBoost.cmake +@@ -137,14 +137,14 @@ function(do_build_boost version) + check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version}) + set(source_dir + SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost") +- elseif(version VERSION_GREATER 1.67) ++ elseif(version VERSION_GREATER 1.70) + message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}") + else() + message(STATUS "boost will be downloaded...") + # NOTE: If you change this version number make sure the package is available + # at the three URLs below (may involve uploading to download.ceph.com) +- set(boost_version 1.67.0) +- set(boost_sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba) ++ set(boost_version 1.70.0) ++ set(boost_sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778) + string(REPLACE "." "_" boost_version_underscore ${boost_version} ) + set(boost_url + https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2) +diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc +index e4be074ec7..4af3695dc1 100644 +--- a/src/rgw/rgw_asio_frontend.cc ++++ b/src/rgw/rgw_asio_frontend.cc +@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO { + using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>; + + template <typename Stream> +-void handle_connection(RGWProcessEnv& env, Stream& stream, ++void handle_connection(boost::asio::io_context& context, ++ RGWProcessEnv& env, Stream& stream, + boost::beast::flat_buffer& buffer, bool is_ssl, + SharedMutex& pause_mutex, + rgw::dmclock::Scheduler *scheduler, +@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream, + rgw::io::add_conlen_controlling( + &real_client)))); + RGWRestfulIO client(cct, &real_client_io); +- auto y = optional_yield{socket.get_io_context(), yield}; ++ auto y = optional_yield{context, yield}; + process_request(env.store, env.rest, &req, env.uri_prefix, + *env.auth_registry, &client, env.olog, y, scheduler); + } +@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) + return; + } + buffer.consume(bytes); +- handle_connection(env, stream, buffer, true, pause_mutex, ++ handle_connection(context, env, stream, buffer, true, pause_mutex, + scheduler.get(), ec, yield); + if (!ec) { + // ssl shutdown (ignoring errors) +@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) + auto c = connections.add(conn); + boost::beast::flat_buffer buffer; + boost::system::error_code ec; +- handle_connection(env, s, buffer, false, pause_mutex, ++ handle_connection(context, env, s, buffer, false, pause_mutex, + scheduler.get(), ec, yield); + s.shutdown(tcp::socket::shutdown_both, ec); + }); +diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h +index 70487a5253..1d454acd2e 100644 +--- a/src/rgw/rgw_dmclock_async_scheduler.h ++++ b/src/rgw/rgw_dmclock_async_scheduler.h +@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler { + using Completion = async::Completion<Signature, async::AsBase<Request>>; + + using Clock = ceph::coarse_real_clock; ++#if BOOST_VERSION < 107000 + using Timer = boost::asio::basic_waitable_timer<Clock>; ++#else ++ using Timer = boost::asio::basic_waitable_timer<Clock, ++ boost::asio::wait_traits<Clock>, executor_type>; ++#endif + Timer timer; //< timer for the next scheduled request + + CephContext *const cct; +diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h +index d99a6ff68d..213fc238d2 100644 +--- a/src/rgw/rgw_reshard.h ++++ b/src/rgw/rgw_reshard.h +@@ -183,7 +183,14 @@ class RGWReshardWait { + ceph::condition_variable cond; + + struct Waiter : boost::intrusive::list_base_hook<> { +- boost::asio::basic_waitable_timer<Clock> timer; ++#if BOOST_VERSION < 107000 ++ using Timer = boost::asio::basic_waitable_timer<Clock>; ++#else ++ using Executor = boost::asio::io_context::executor_type; ++ using Timer = boost::asio::basic_waitable_timer<Clock, ++ boost::asio::wait_traits<Clock>, Executor>; ++#endif ++ Timer timer; + explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {} + }; + boost::intrusive::list<Waiter> waiters; diff --git a/sys-cluster/ceph/files/ceph.initd-r12 b/sys-cluster/ceph/files/ceph.initd-r12 new file mode 100644 index 000000000000..4a90e3c3f984 --- /dev/null +++ b/sys-cluster/ceph/files/ceph.initd-r12 @@ -0,0 +1,115 @@ +#!/sbin/openrc-run + +# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc +_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}" +if [ -r "${_CONFD_FILE}" ]; then + . "${_CONFD_FILE}" || exit 1 +fi + +: "${ceph_conf:=/etc/ceph/ceph.conf}" +daemon_type="${RC_SVCNAME#ceph-}" +daemon_type="${daemon_type%%.*}" +daemon_id="${RC_SVCNAME#ceph-*.}" +daemon_id="${daemon_id:-0}" +: "${rundir:=/run/ceph}" +: "${user:=ceph}" +: "${group:=ceph}" +: "${rc_ulimit:=-n 1048576 -u 1048576}" + +pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" +daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" + +command="/usr/bin/${RC_SVCNAME%%.*}" +command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" +extra_commands="${extra_commands} reload" +command_args_foreground="--foreground" + +retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" +start_stop_daemon_args="--user ${user} --group ${group}" +supervise_daemon_args="--user ${user} --group ${group}" + +: "${supervisor:=supervise-daemon}" +: "${stdout:=/var/log/ceph/ceph}" +: "${stderr:=/var/log/ceph/ceph}" +: "${respawn_delay:=10}" +: "${respawn_max:=5}" +: "${respawn_period:=1800}" + +: "${osd_respawn_delay:=15}" +: "{osd_respawn_max:=10}" + +: "{radosgw_respawn_max:=5}" +: "${radosgw_respawn_period:=30}" + +depend() { + use dns logger + after net ntpd ntp-client chronyd + before netmount +} + +is_type_valid() { + case ${daemon_type} in + mon|mds|osd|mgr|radosgw) return 0;; + *) return 1;; + esac +} + +start_pre() { + local log_dir + export CEPH_CONF="${ceph_conf}" + + checkpath -d -q -o "${user}:${group}" "${rundir}" + + if ! is_type_valid ;then + eerror "Please give valid Ceph Server Type: mds, mon, osd" + return 1 + + elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then + eerror "${daemon_type}.${daemon_id} is still running, refusing to start" + return 1 + fi + + if [ -n "${bluestore_osd_fsid}" ]; then + einfo "Mounting Bluestore" + ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd + fi + + if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then + command_args="${command_args} --name client.${daemon_id}" + fi + + local arg_name arg_val repl_arg_name + for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do + eval arg_val="\${${daemon_type}_${arg_name}}" + + if [ -z "${arg_val}" ]; then + eval arg_val="\${${arg_name}}" + else + eval "${arg_name}=\"${arg_val}\"" + fi + + if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then + local log_file log_postfix + log_postfix=".${daemon_id}-${arg_name}.log" + log_file="${arg_val}" + + if [ "${log_file}" != /dev/null ]; then + log_file="${log_file}${log_postfix}" + + log_dir="$(dirname "${log_file}")" + checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}" + fi + + repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)" + supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}" + fi + done +} + +reload() { + ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" + start-stop-daemon --signal 1 "${start_stop_daemon_args}" + eend ${?} +} + +# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: |