commit: 9c1469bcc815ad185bba2b5300887a3a142e8603 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Mon Apr 15 23:26:37 2019 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Mon Apr 15 23:26:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1469bc
sys-cluster/ceph: Revbumps, 681068, 651460, 671482, 682664, 638750 Cleanups for a lot of old bugs that had fallen through the cracks/ Closes: https://bugs.gentoo.org/681068 Closes: https://bugs.gentoo.org/651460 Closes: https://bugs.gentoo.org/671482 Closes: https://bugs.gentoo.org/682664 Closes: https://bugs.gentoo.org/638750 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> ...{ceph-12.2.12.ebuild => ceph-12.2.12-r1.ebuild} | 13 +++++----- ...ceph-13.2.5-r2.ebuild => ceph-13.2.5-r3.ebuild} | 23 +++++++++-------- ...ceph-14.2.0-r4.ebuild => ceph-14.2.0-r5.ebuild} | 13 +++++----- .../ceph/files/ceph-12.2.12-ncurses-tinfo.patch | 20 +++++++++++++++ .../ceph/files/ceph-14.2.1-ncurses-tinfo.patch | 30 ++++++++++++++++++++++ 5 files changed, 77 insertions(+), 22 deletions(-) diff --git a/sys-cluster/ceph/ceph-12.2.12.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild similarity index 96% rename from sys-cluster/ceph/ceph-12.2.12.ebuild rename to sys-cluster/ceph/ceph-12.2.12-r1.ebuild index 002e685d77b..b9a012001e4 100644 --- a/sys-cluster/ceph/ceph-12.2.12.ebuild +++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild @@ -81,7 +81,6 @@ DEPEND="${COMMON_DEPEND} sys-devel/bc virtual/pkgconfig test? ( - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -121,8 +120,6 @@ CMAKE_WARN_UNUSED_CLI="no" # ninja does not work at all CMAKE_MAKEFILE_GENERATOR="emake" -STRIP_MASK="/usr/lib*/rados-classes/*" - UNBUNDLE_LIBS=( src/erasure-code/jerasure/jerasure src/erasure-code/jerasure/gf-complete @@ -141,6 +138,7 @@ PATCHES=( "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch" "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch" "${FILESDIR}/ceph-12.2.12-qa-warning.patch" + "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" ) check-reqs_export_vars() { @@ -189,7 +187,7 @@ ceph_src_configure() { local flag local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" -DWITH_BABELTRACE=$(usex babeltrace) -DWITH_CEPHFS=$(usex cephfs) -DWITH_FUSE=$(usex fuse) @@ -204,7 +202,7 @@ ceph_src_configure() { -DWITH_XFS=$(usex xfs) -DWITH_ZFS=$(usex zfs) -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '') + -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") -DWITH_SYSTEM_BOOST=$(usex system-boost) -DBOOST_J=$(makeopts_jobs) -DWITH_RDMA=no @@ -258,7 +256,7 @@ src_test() { python_install() { local CMAKE_USE_DIR="${S}" pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - DESTDIR="${D}" emake install + DESTDIR="${ED}" emake install popd >/dev/null || die } @@ -312,6 +310,9 @@ src_install() { # 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/ceph-disk,bin/ceph-detect-init} || die "sed failed" + + local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${D}}" } pkg_postinst() { diff --git a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild similarity index 94% rename from sys-cluster/ceph/ceph-13.2.5-r2.ebuild rename to sys-cluster/ceph/ceph-13.2.5-r3.ebuild index 2ef0f19a401..c426116b1e6 100644 --- a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild +++ b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) 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 +inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ + python-r1 udev user readme.gentoo-r1 systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -93,7 +92,6 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig test? ( dev-python/coverage[${PYTHON_USEDEP}] - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -103,7 +101,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] @@ -130,7 +128,8 @@ RESTRICT+=" test" # false positives unless all USE flags are on CMAKE_WARN_UNUSED_CLI="no" -STRIP_MASK="/usr/lib*/rados-classes/*" +# ninja does not work at all +CMAKE_MAKEFILE_GENERATOR="emake" UNBUNDLE_LIBS=( src/erasure-code/jerasure/jerasure @@ -148,6 +147,7 @@ PATCHES=( "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" "${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch" "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" + "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" ) check-reqs_export_vars() { @@ -236,7 +236,7 @@ ceph_src_configure() { # bug #630232 sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ + "${BUILD_DIR:--${S}}"/include/acconfig.h \ || die "sed failed" } @@ -283,10 +283,10 @@ src_install() { cmake-utils_src_install python_foreach_impl python_install - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die exeinto /usr/$(get_libdir)/ceph - newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh + newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh insinto /etc/logrotate.d/ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} @@ -329,6 +329,9 @@ src_install() { # 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/ceph-disk,bin/ceph-detect-init} || die "sed failed" + + local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${D}}" } pkg_postinst() { diff --git a/sys-cluster/ceph/ceph-14.2.0-r4.ebuild b/sys-cluster/ceph/ceph-14.2.0-r5.ebuild similarity index 97% rename from sys-cluster/ceph/ceph-14.2.0-r4.ebuild rename to sys-cluster/ceph/ceph-14.2.0-r5.ebuild index 61c4b21e9f8..3484f7a13d0 100644 --- a/sys-cluster/ceph/ceph-14.2.0-r4.ebuild +++ b/sys-cluster/ceph/ceph-14.2.0-r5.ebuild @@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND} dev-util/cunit test? ( dev-python/coverage[${PYTHON_USEDEP}] - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -105,7 +104,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] @@ -133,8 +132,6 @@ RESTRICT+=" test" # false positives unless all USE flags are on CMAKE_WARN_UNUSED_CLI="no" -STRIP_MASK="/usr/lib*/rados-classes/*" - UNBUNDLE_LIBS=( src/erasure-code/jerasure/jerasure src/erasure-code/jerasure/gf-complete @@ -151,6 +148,7 @@ PATCHES=( "${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 @@ -245,7 +243,7 @@ ceph_src_configure() { # bug #630232 sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ + "${BUILD_DIR:-${S}}"/include/acconfig.h \ || die "sed failed" } @@ -271,7 +269,7 @@ src_compile() { cmake-utils_src_make VERBOSE=1 all # we have to do this here to prevent from building everything multiple times - BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources + python_copy_sources python_foreach_impl python_compile } @@ -336,6 +334,9 @@ src_install() { # 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=( "${D}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${D}}" } pkg_postinst() { 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 new file mode 100644 index 00000000000..1b72e5447db --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch @@ -0,0 +1,20 @@ +diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt +index 7aa42e9efd..66186b159f 100644 +--- a/src/tools/rbd/CMakeLists.txt ++++ b/src/tools/rbd/CMakeLists.txt +@@ -1,3 +1,6 @@ ++set(CURSES_NEED_NCURSES TRUE) ++find_package(Curses REQUIRED) ++ + set(rbd_srcs + rbd.cc + ArgumentTypes.cc +@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados + cls_journal_client cls_rbd_client + rbd_types + journal +- ceph-common global ++ ceph-common global ${CURSES_LIBRARIES} + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + if(WITH_KRBD) + target_link_libraries(rbd diff --git a/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch new file mode 100644 index 00000000000..7f74a102d77 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch @@ -0,0 +1,30 @@ +From b7bf406cff5e0f82fc87f19d5987cd4e719919e1 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Mon, 8 Apr 2019 16:34:53 +0200 +Subject: [PATCH] cmake: Fix build against ncurses with separate libtinfo + +Signed-off-by: Lars Wendler <[email protected]> +--- + src/tools/rbd/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt +index 36b2408a8d28..0e38a033ff55 100644 +--- a/src/tools/rbd/CMakeLists.txt ++++ b/src/tools/rbd/CMakeLists.txt +@@ -1,3 +1,6 @@ ++set(CURSES_NEED_NCURSES TRUE) ++find_package(Curses REQUIRED) ++ + set(rbd_srcs + rbd.cc + ArgumentTypes.cc +@@ -52,7 +55,7 @@ target_link_libraries(rbd librbd librados + cls_journal_client cls_rbd_client + rbd_types + journal +- ceph-common global ncurses ++ ceph-common global ${CURSES_LIBRARIES} + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + if(WITH_KRBD) + target_link_libraries(rbd
