diff options
author | 2022-05-13 12:58:30 +0200 | |
---|---|---|
committer | 2022-05-13 12:58:30 +0200 | |
commit | f85541d10c3ae4ea7feacc2008a278e4dee25044 (patch) | |
tree | 3b4f00e1f4ef0836f57448d3f48436bb2cece7ab /sys-cluster | |
parent | app-metrics/ceph_exporter: Remove old (diff) | |
download | gentoo-f85541d10c3ae4ea7feacc2008a278e4dee25044.tar.gz gentoo-f85541d10c3ae4ea7feacc2008a278e4dee25044.tar.bz2 gentoo-f85541d10c3ae4ea7feacc2008a278e4dee25044.zip |
sys-cluster/ceph: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-cluster')
11 files changed, 0 insertions, 764 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 884ad263bca6..325977641159 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,4 +1,3 @@ -DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad15d16690dcbd1511d1b506477845efc3ff7fbe713cf18fb8cfcc8c16707ad2a0f30159e3198ff82e57fbd2eb3cf2 SHA512 1c66661e1a39fa9151e95e33c390b810ffe269465d8785e2197cc15b8d83bd2edde77de48a8abd71a4da68cd5830ff14bcdf6b98fd17edabe85caeb1eca018d3 DIST ceph-15.2.16.tar.gz 148628915 BLAKE2B 4f624078027c706428eae3eddd5b5479efe3b4442c19a4e6b6cdf8d3839cf56e2863b18249dc3c5079a7e25f60796bfec3202ffd695537587654f5e2f820caaa SHA512 532b8a5073e157fe9ed552b26976faeb64dc29b79a249910c0982134ad5f945d4f57d8bf451adf63487b6d285c6e4bd5c39f0e3fcd449230d6fb3087539f8c3b DIST ceph-16.2.7.tar.gz 156621262 BLAKE2B 3c79cb1586e71927df4578fe7f3a13f4ab257a5e145b6bf76d942292cbca7bf32583350373f3d816f6d8f8700ee0f98a14f350c823b0eb89ffd7735acee7de63 SHA512 eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c DIST ceph-17.2.0.tar.gz 168742006 BLAKE2B 15272da3471722936198f62b5ef7537d29bd944b35ef1552e87cf0f0f400a8be5fd1fa873494eb17ca71df9360d7ffa4fa20a6f1b1ba819520b180770a4e6299 SHA512 70b96e709f153f16069bec8346ea73812d699eaab91a012351d02addb3fd176b84fce32c3dae84fdf91d0ffe49f2bb258410b47caeee81d81a672b4dbd04cc7e diff --git a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild deleted file mode 100644 index 860ccfb14768..000000000000 --- a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild +++ /dev/null @@ -1,394 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -CMAKE_MAKEFILE_GENERATOR=emake - -DISTUTILS_OPTIONAL=1 - -inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ - python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles - -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 ~ppc64" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc - kafka kerberos ldap lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost - systemd +tcmalloc test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -DEPEND=" - acct-group/ceph - acct-user/ceph - virtual/libudev:= - app-arch/bzip2:= - app-arch/lz4:= - app-arch/snappy:= - app-arch/zstd:= - app-shells/bash:0 - app-misc/jq:= - dev-libs/crypto++:= - <dev-libs/leveldb-1.21:=[snappy,tcmalloc(-)?] - dev-libs/libaio:= - dev-libs/libnl:3= - dev-libs/libxml2:= - <dev-libs/rocksdb-6.15:= - dev-libs/xmlsec:=[openssl] - dev-cpp/yaml-cpp:= - dev-libs/nss:= - dev-libs/protobuf:= - net-dns/c-ares:= - net-libs/gnutls:= - sys-auth/oath-toolkit:= - sys-apps/coreutils - sys-apps/grep - sys-apps/hwloc:= - sys-apps/keyutils:= - sys-apps/util-linux:= - sys-apps/sed - sys-apps/util-linux - sys-libs/libcap-ng:= - sys-libs/ncurses:0= - sys-libs/zlib:= - sys-process/numactl:= - x11-libs/libpciaccess:= - virtual/libcrypt:= - babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0= ) - jemalloc? ( dev-libs/jemalloc:= ) - !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) - kafka? ( dev-libs/librdkafka:= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - lttng? ( dev-util/lttng-ust:= ) - rabbitmq? ( net-libs/rabbitmq-c:= ) - radosgw? ( - dev-libs/expat:= - dev-libs/openssl:= - net-misc/curl:=[curl_ssl_openssl] - ) - ssl? ( dev-libs/openssl:= ) - system-boost? ( dev-libs/boost:=[threads(+),context,python,${PYTHON_USEDEP}] ) - xfs? ( sys-fs/xfsprogs:= ) - zfs? ( sys-fs/zfs:= ) -" -BDEPEND=" - ${PYTHON_DEPS} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - app-arch/cpio - >=dev-util/cmake-3.5.0 - dev-python/cython[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - dev-util/gperf - dev-util/ragel - dev-util/valgrind - sys-apps/coreutils - sys-apps/grep - sys-apps/sed - sys-apps/which - sys-devel/bc - sys-devel/patch - virtual/pkgconfig - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - ) -" -RDEPEND="${DEPEND} - ${PYTHON_DEPS} - app-admin/sudo - net-misc/socat - sys-apps/gptfdisk - >=sys-apps/smartmontools-7.0 - sys-block/parted - sys-fs/cryptsetup - sys-fs/lsscsi - sys-fs/lvm2[-device-mapper-only(-)] - virtual/awk - 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/setuptools[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - mgr? ( - dev-python/more-itertools[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - <dev-python/pyjwt-2.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/routes[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" -# diskprediction needs older scipy not compatible with py38 -# bug #724438 -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( jemalloc tcmalloc ) - diskprediction? ( mgr !python_targets_python3_8 ) - kafka? ( radosgw ) - mgr? ( cephfs ) - rabbitmq? ( radosgw ) -" -RESTRICT="!test? ( test )" - -# the tests need root access -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# create a non-debug release -CMAKE_BUILD_TYPE=RelWithDebInfo - -# false positives unless all USE flags are on -CMAKE_WARN_UNUSED_CLI=no - -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-14.2.22-cflags.patch" - "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch" - "${FILESDIR}/ceph-14.2.22-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-cython-0.29.patch" - "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch" - "${FILESDIR}/ceph-14.2.4-python-executable.patch" - "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch" - "${FILESDIR}/ceph-14.2.22-build-without-mgr.patch" - "${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch" - "${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch" - "${FILESDIR}/ceph-14.2.22-snappy-uint32.patch" -) - -check-reqs_export_vars() { - CHECKREQS_DISK_BUILD="5200M" - CHECKREQS_DISK_USR="510M" - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup - check-reqs_export_vars - check-reqs_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if use system-boost; then - find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ - | xargs --null sed -r \ - -e 's|Boost::|boost_|g' \ - -e 's|Boost_|boost_|g' \ - -e 's|[Bb]oost_boost|boost_system|g' -i || die - fi - - sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - -i src/bash_completion/CMakeLists.txt || die - - sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die - - if ! use diskprediction; then - rm -rf src/pybind/mgr/diskprediction_local || die - fi - - # 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=$(usex cephfs) - -DWITH_DPDK=$(usex dpdk) - -DWITH_SPDK=$(usex spdk) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_GRAFANA=$(usex grafana) - -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=OFF - -DWITH_NUMA=$(usex numa) - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_PYTHON3=3 - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) - -DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED="ON" - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_SYSTEM_ROCKSDB=ON - -DWITH_RDMA=OFF - -DWITH_TBB=OFF - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(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 - - # needed for >=glibc-2.32 - has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON) - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ - || die "failed to remove cmake cache" - - cmake_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${S}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - use custom-cflags || strip-flags - 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_build 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 - - python_optimize -} - -src_install() { - cmake_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/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 - newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf - - readme.gentoo_create_doc - - python_setup - - # 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 - local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' - grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ - | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die - - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) - dostrip -x "${rados_classes[@]#${ED}}" -} - -pkg_postinst() { - readme.gentoo_print_elog - tmpfiles_process ${PN}.conf -} diff --git a/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch b/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch deleted file mode 100644 index e4502a608ec2..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.0-mgr-python-version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt -index 664543172a..e74d73c084 100644 ---- a/src/pybind/CMakeLists.txt -+++ b/src/pybind/CMakeLists.txt -@@ -62,12 +62,6 @@ foreach(python_version ${py_vers}) - endforeach() - - if(WITH_MGR) -- if(NOT WITH_PYTHON2 AND MGR_PYTHON_VERSION_MAJOR EQUAL 2) -- message(FATAL_ERROR "mgr plugins require python2 binding") -- elseif(NOT WITH_PYTHON3 AND MGR_PYTHON_VERSION_MAJOR EQUAL 3) -- message(FATAL_ERROR "mgr plugins require python3 binding") -- endif() -- - if(USE_OPENSSL) - execute_process( - COMMAND ${PYTHON${PYTHON_VERSION}_EXECUTABLE} -c "import ssl; print('.'.join(map(str,ssl.OPENSSL_VERSION_INFO[0:3])))" diff --git a/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch deleted file mode 100644 index 7309fea029e1..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001 -From: Jan Fajerski <jfajerski@suse.com> -Date: Fri, 12 Jun 2020 09:27:36 +0200 -Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in - /usr/libexec - -Fixes: https://tracker.ceph.com/issues/45984 -Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29 - -Signed-off-by: Jan Fajerski <jfajerski@suse.com> ---- - systemd/ceph-osd@.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in -index a0067d347220..4a2254e99478 100644 ---- a/systemd/ceph-osd@.service.in -+++ b/systemd/ceph-osd@.service.in -@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph - EnvironmentFile=-@SYSTEMD_ENV_FILE@ - Environment=CLUSTER=ceph - ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph --ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i -+ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i - ExecReload=/bin/kill -HUP $MAINPID - LockPersonality=true - MemoryDenyWriteExecute=true diff --git a/sys-cluster/ceph/files/ceph-14.2.22-build-without-mgr.patch b/sys-cluster/ceph/files/ceph-14.2.22-build-without-mgr.patch deleted file mode 100644 index f3ba34cc165c..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.22-build-without-mgr.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ed4bbc75d44..5f5e72918d2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -451,9 +451,7 @@ if(WITH_LIBRADOSSTRIPER) - add_subdirectory(libradosstriper) - endif() - --if(WITH_MGR) -- add_subdirectory(mgr) --endif() -+add_subdirectory(mgr) - - set(librados_config_srcs - librados-config.cc) -diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt -index e7caaeff099..b4f13c05184 100644 ---- a/src/mgr/CMakeLists.txt -+++ b/src/mgr/CMakeLists.txt -@@ -1,6 +1,7 @@ - add_library(mgr_cap_obj OBJECT - MgrCap.cc) - -+if(WITH_MGR) - set(mgr_srcs - ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc - ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc -@@ -36,3 +37,4 @@ target_link_libraries(ceph-mgr - set_target_properties(ceph-mgr PROPERTIES - POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) - install(TARGETS ceph-mgr DESTINATION bin) -+endif() diff --git a/sys-cluster/ceph/files/ceph-14.2.22-cflags.patch b/sys-cluster/ceph/files/ceph-14.2.22-cflags.patch deleted file mode 100644 index 5c9f17098616..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.22-cflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake -index eaab331413b..4ee3f1b0768 100644 ---- a/cmake/modules/BuildBoost.cmake -+++ b/cmake/modules/BuildBoost.cmake -@@ -62,7 +62,7 @@ function(do_build_boost version) - else() - list(APPEND boost_features "address-model=32") - endif() -- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX -+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX - list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") - - set(boost_with_libs) -diff --git a/cmake/modules/BuildZstd.cmake b/cmake/modules/BuildZstd.cmake -index 799b14b281d..9b4b5ee8dcf 100644 ---- a/cmake/modules/BuildZstd.cmake -+++ b/cmake/modules/BuildZstd.cmake -@@ -1,6 +1,6 @@ - # libzstd - build it statically - function(build_Zstd) -- set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3") -+ set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable $ENV{CFLAGS} -O3") - - include(ExternalProject) - ExternalProject_Add(zstd_ext diff --git a/sys-cluster/ceph/files/ceph-14.2.22-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-14.2.22-no-virtualenvs.patch deleted file mode 100644 index 534133122f99..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.22-no-virtualenvs.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt -index 7c9cc4abd56..9f84b0c2b26 100644 ---- a/src/pybind/mgr/dashboard/CMakeLists.txt -+++ b/src/pybind/mgr/dashboard/CMakeLists.txt -@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) - - add_custom_target(mgr-dashboard-test-venv - COMMAND -- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} -+ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard - COMMENT "dashboard tests virtualenv is being created") - add_dependencies(tests mgr-dashboard-test-venv) -@@ -14,9 +14,9 @@ function(add_npm_command) - set(multi_kw COMMAND DEPENDS) - cmake_parse_arguments(NC "${options}" "${single_kw}" "${multi_kw}" ${ARGN}) - string(REPLACE ";" " " command "${NC_COMMAND}") -- if(NC_NODEENV) -- string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) -- endif() -+ #if(NC_NODEENV) -+ # string(REGEX REPLACE "^(.*(npm|npx) .*)$" ". ${mgr-dashboard-nodeenv-dir}/bin/activate && \\1 && deactivate" command ${command}) -+ #endif() - string(REPLACE " " ";" command "${command}") - add_custom_command( - OUTPUT "${NC_OUTPUT}" -@@ -41,9 +41,9 @@ else() - - add_custom_command( - OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" -- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} -- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv -- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose -p --node=10.13.0 -+ #COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} -+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv -+ #COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose -p --node=10.13.0 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "dashboard nodeenv is being installed" - ) diff --git a/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch deleted file mode 100644 index c783558a1758..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h -index 0291a923112..352ab9a9bcf 100644 ---- a/src/compressor/snappy/SnappyCompressor.h -+++ b/src/compressor/snappy/SnappyCompressor.h -@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { - if (qat_enabled) - return qat_accel.decompress(p, compressed_len, dst); - #endif -- snappy::uint32 res_len = 0; -+ uint32_t res_len = 0; - BufferlistSource source_1(p, compressed_len); - if (!snappy::GetUncompressedLength(&source_1, &res_len)) { - return -1; diff --git a/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch b/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch deleted file mode 100644 index ef06758326e9..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.3-dpdk-compile-fix-1.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc -index 3101ae57ac..1db97c289a 100644 ---- a/src/msg/async/dpdk/DPDKStack.cc -+++ b/src/msg/async/dpdk/DPDKStack.cc -@@ -203,7 +203,9 @@ DPDKWorker::Impl::~Impl() - _dev->unset_local_queue(id); - } - --int DPDKWorker::listen(entity_addr_t &sa, const SocketOptions &opt, -+int DPDKWorker::listen(entity_addr_t &sa, -+ unsigned addr_slot, -+ const SocketOptions &opt, - ServerSocket *sock) - { - ceph_assert(sa.get_family() == AF_INET); -diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h -index a44ae38367..622ff8a3c6 100644 ---- a/src/msg/async/dpdk/DPDKStack.h -+++ b/src/msg/async/dpdk/DPDKStack.h -@@ -37,7 +37,7 @@ class DPDKServerSocketImpl : public ServerSocketImpl { - typename Protocol::listener _listener; - public: - DPDKServerSocketImpl(Protocol& proto, uint16_t port, const SocketOptions &opt, -- int type); -+ int type, unsigned addr_slot); - int listen() { - return _listener.listen(); - } -@@ -184,8 +184,9 @@ class NativeConnectedSocketImpl : public ConnectedSocketImpl { - - template <typename Protocol> - DPDKServerSocketImpl<Protocol>::DPDKServerSocketImpl( -- Protocol& proto, uint16_t port, const SocketOptions &opt, int type) -- : ServerSocketImpl(type), _listener(proto.listen(port)) {} -+ Protocol& proto, uint16_t port, const SocketOptions &opt, -+ int type, unsigned addr_slot) -+ : ServerSocketImpl(type, addr_slot), _listener(proto.listen(port)) {} - - template <typename Protocol> - int DPDKServerSocketImpl<Protocol>::accept(ConnectedSocket *s, const SocketOptions &options, entity_addr_t *out, Worker *w) { -@@ -229,7 +230,8 @@ class DPDKWorker : public Worker { - - public: - explicit DPDKWorker(CephContext *c, unsigned i): Worker(c, i) {} -- virtual int listen(entity_addr_t &addr, const SocketOptions &opts, ServerSocket *) override; -+ virtual int listen(entity_addr_t &addr, unsigned addr_slot, -+ const SocketOptions &opts, ServerSocket *) override; - virtual int connect(const entity_addr_t &addr, const SocketOptions &opts, ConnectedSocket *socket) override; - void arp_learn(ethernet_address l2, ipv4_address l3) { - _impl->_inet.learn(l2, l3); -diff --git a/src/msg/async/dpdk/TCP.cc b/src/msg/async/dpdk/TCP.cc -index c6397709b1..26f29e10f7 100644 ---- a/src/msg/async/dpdk/TCP.cc -+++ b/src/msg/async/dpdk/TCP.cc -@@ -153,9 +153,10 @@ bool ipv4_tcp::forward(forward_hash& out_hash_data, Packet& p, size_t off) - } - - int tcpv4_listen(tcp<ipv4_traits>& tcpv4, uint16_t port, const SocketOptions &opts, -- int type, ServerSocket *sock) -+ int type, unsigned addr_slot, ServerSocket *sock) - { -- auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts, type); -+ auto p = new DPDKServerSocketImpl<tcp<ipv4_traits>>(tcpv4, port, opts, -+ type, addr_slot); - int r = p->listen(); - if (r < 0) { - delete p; -diff --git a/src/msg/async/dpdk/DPDK.h b/src/msg/async/dpdk/DPDK.h -index fa12af6b27..6bb52973e0 100644 ---- a/src/msg/async/dpdk/DPDK.h -+++ b/src/msg/async/dpdk/DPDK.h -@@ -833,7 +833,7 @@ class DPDKDevice { - subscription<Packet> receive(unsigned cpuid, std::function<int (Packet)> next_packet) { - auto sub = _queues[cpuid]->_rx_stream.listen(std::move(next_packet)); - _queues[cpuid]->rx_start(); -- return std::move(sub); -+ return sub; - } - ethernet_address hw_address() { - struct ether_addr mac; -@@ -849,7 +849,7 @@ class DPDKDevice { - std::unique_ptr<DPDKQueuePair> init_local_queue(CephContext *c, EventCenter *center, string hugepages, uint16_t qid) { - std::unique_ptr<DPDKQueuePair> qp; - qp = std::unique_ptr<DPDKQueuePair>(new DPDKQueuePair(c, center, this, qid)); -- return std::move(qp); -+ return qp; - } - unsigned hash2qid(uint32_t hash) { - // return hash % hw_queues_count(); -diff --git a/src/msg/async/dpdk/Packet.h b/src/msg/async/dpdk/Packet.h -index db9cd2a764..f929da3178 100644 ---- a/src/msg/async/dpdk/Packet.h -+++ b/src/msg/async/dpdk/Packet.h -@@ -125,7 +125,7 @@ class Packet { - n->rss_hash.construct(old->rss_hash); - std::copy(old->frags, old->frags + old->_nr_frags, n->frags); - old->copy_internal_fragment_to(n.get()); -- return std::move(n); -+ return n; - } - - static std::unique_ptr<impl> copy(impl* old) { -@@ -134,7 +134,7 @@ class Packet { - - static std::unique_ptr<impl> allocate_if_needed(std::unique_ptr<impl> old, size_t extra_frags) { - if (old->_allocated_frags >= old->_nr_frags + extra_frags) { -- return std::move(old); -+ return old; - } - return copy(old.get(), std::max<size_t>(old->_nr_frags + extra_frags, 2 * old->_nr_frags)); - } diff --git a/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch b/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch deleted file mode 100644 index 40feaf11ad39..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.4-python-executable.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/ceph-crash.in b/src/ceph-crash.in -index 5bfb50c474..d53c4eeb6a 100755 ---- a/src/ceph-crash.in -+++ b/src/ceph-crash.in -@@ -1,4 +1,4 @@ --#!@PYTHON_EXECUTABLE@ -+#!@PYTHON3_EXECUTABLE@ - # -*- mode:python -*- - # vim: ts=4 sw=4 smarttab expandtab - -diff --git a/src/ceph.in b/src/ceph.in -index f060023f57..3a84263ccc 100755 ---- a/src/ceph.in -+++ b/src/ceph.in -@@ -1,4 +1,4 @@ --#!@PYTHON_EXECUTABLE@ -+#!@PYTHON3_EXECUTABLE@ - # -*- mode:python -*- - # vim: ts=4 sw=4 smarttab expandtab - # -@@ -66,7 +66,7 @@ DEVMODEMSG = '*** DEVELOPER MODE: setting PATH, PYTHONPATH and LD_LIBRARY_PATH * - def respawn_in_path(lib_path, pybind_path, pythonlib_path, asan_lib_path): - execv_cmd = [] - if 'CEPH_DBG' in os.environ: -- execv_cmd += ['@PYTHON_EXECUTABLE@', '-mpdb'] -+ execv_cmd += ['@PYTHON3_EXECUTABLE@', '-mpdb'] - - if platform.system() == "Darwin": - lib_path_var = "DYLD_LIBRARY_PATH" diff --git a/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch b/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch deleted file mode 100644 index 99249fb01a0c..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.4-undefined-behaviour.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/include/blobhash.h b/src/include/blobhash.h -index 597884e4c9..97f2065ce3 100644 ---- a/src/include/blobhash.h -+++ b/src/include/blobhash.h -@@ -14,33 +14,40 @@ - #ifndef CEPH_BLOBHASH_H - #define CEPH_BLOBHASH_H - -+#include <cstdint> - #include "hash.h" - --/* --- this is to make some of the STL types work with 64 bit values, string hash keys, etc. --- added when i was using an old STL.. maybe try taking these out and see if things -- compile now? --*/ -- - class blobhash { - public: -- uint32_t operator()(const char *p, unsigned len) { -- static rjhash<uint32_t> H; -- uint32_t acc = 0; -+ uint32_t operator()(const void* p, size_t len) { -+ static rjhash<std::uint32_t> H; -+ std::uint32_t acc = 0; -+ auto buf = static_cast<const unsigned char*>(p); - while (len >= sizeof(acc)) { -- acc ^= *(uint32_t*)p; -- p += sizeof(uint32_t); -- len -= sizeof(uint32_t); -+ acc ^= unaligned_load(buf); -+ buf += sizeof(std::uint32_t); -+ len -= sizeof(std::uint32_t); - } -- int sh = 0; -- while (len) { -- acc ^= (uint32_t)*p << sh; -- sh += 8; -- len--; -- p++; -+ // handle the last few bytes of p[-(len % 4):] -+ switch (len) { -+ case 3: -+ acc ^= buf[2] << 16; -+ [[fallthrough]]; -+ case 2: -+ acc ^= buf[1] << 8; -+ [[fallthrough]]; -+ case 1: -+ acc ^= buf[0]; -+ [[fallthrough]]; - } - return H(acc); - } -+private: -+ static inline std::uint32_t unaligned_load(const unsigned char* p) { -+ std::uint32_t result; -+ __builtin_memcpy(&result, p, sizeof(result)); -+ return result; -+ } - }; - - -diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h -index b6952ca498..576b7d6b8a 100644 ---- a/src/msg/msg_types.h -+++ b/src/msg/msg_types.h -@@ -566,7 +566,7 @@ namespace std { - size_t operator()( const entity_addr_t& x ) const - { - static blobhash H; -- return H((const char*)&x, sizeof(x)); -+ return H(&x, sizeof(x)); - } - }; - } // namespace std |