commit: 7eea3cfaacc3251aaefa1fb0575927ded4036cfc Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Thu Sep 7 23:40:21 2017 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu Sep 7 23:40:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eea3cfa
sys-cluster/ceph: Clean out old versions Package-Manager: Portage-2.3.8, Repoman-2.3.3 sys-cluster/ceph/Manifest | 3 - sys-cluster/ceph/ceph-0.94.9.ebuild | 172 --------------- sys-cluster/ceph/ceph-10.2.8.ebuild | 292 ------------------------- sys-cluster/ceph/ceph-9.2.1-r2.ebuild | 189 ---------------- sys-cluster/ceph/files/ceph-0.79-libzfs.patch | 13 -- sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch | 28 --- 6 files changed, 697 deletions(-) diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index ba05389cad1..54c044058ee 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,7 +1,4 @@ -DIST ceph-0.94.9.tar.gz 9044702 SHA256 d5bc07e7aef75f74d75f0356e5dd2a17956cbad6bb552a1e96a0fabd80924050 SHA512 ef4bbcc4429e22a2d924fd52dc42f522d5327f67ee8c1781d7cf602c2932a485cb48db21bdc33e7c7fbc968eec59c17882ebb18e6405599e11a3abc248f1d376 WHIRLPOOL f348159e8d7dd5e1ac3810a51846f50f6cefdbc5fa4cd15c3127b1136eb960baca8ad8db33c78a5d6435720cf1e2c277e068d09f9b9dbcf0f8ad56d7ddd914dc DIST ceph-10.2.3.tar.gz 11596171 SHA256 dca933aa14db67b404d836ef510bd418091978edc2f0c74dfc530ba0aa5e8994 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19 WHIRLPOOL 981ebca66113a07a5cc6e5934272a72b29a2c19e03398f7b622c11df6ea0a05339558dfc2f11504403cbbd0efe0b090ad59f4b86206b46db57587744091aa26a DIST ceph-10.2.7.tar.gz 14518491 SHA256 2cdfeaa9a08e94c2d35f540b450bbf64b2a694bd537679834185e98fc59d8ba2 SHA512 7e0686e9efa4ddd9d548f4145b448f8232f1ca29b08428daa5cd60a74ce26f1176a1f2ebbf2ac1761d9e6c1d364a5ffa194d2b3a18a8111f59b7c27f7a1d7734 WHIRLPOOL b6b6902230401b5f4c6f27801f315678bdc7b99aab4e50b54d941fc3a425b4f0fa9390484f2e12d6b4f962253fb8772fb706dad35d490b4542b06db166fab59b -DIST ceph-10.2.8.tar.gz 14548472 SHA256 f284743b007cbb61fc9849dc2249942886116c2cb2abcd346d2304d52b16eaaa SHA512 1f3bf81bf6745033e034c3c4e4f05db5c39b2e8435da20fc130971559e8fde0d640bf00bfaafb374d24c45f873e7d768ae9d7d8cd3388347f5804c4bfc303f09 WHIRLPOOL a8bf29ff913c08d423beb0fefa792c06a653d8ac00bd698b7f77bbaf4657f0530ad5a43043dabb24308ed5a4e569fec53130a78d78d8eddf16026a942de8cc40 DIST ceph-10.2.9.tar.gz 14550219 SHA256 3d93f4fc4a66b1d9f9ce43f65868dc18287cea32fbb2c7421faca6aed2b52a80 SHA512 1d59146614aa87ca551b05b795a684071a3cfb4ce6013e978ba650403c6732b2aa13f3c3cc191e6a1ea34b4631c82e97700593c24e200c41ec2f2b43b3ef5547 WHIRLPOOL 42215d33c4f617087e1b0ef81cd41b42330c3605acf625b0668d44eba9e982239683b466a1cc1a6f926fc1d439dfd6be4ce220f783da7d2214d36a2a6cc9181f DIST ceph-12.2.0.tar.gz 148372459 SHA256 0f601a9e28e9ce6837119b3ef0d89e1e44e0432f1f5d55567a947efefdd4d4ce SHA512 e084109c48f5666e35df5ee49262dee36ba5e7620fda30002dec538a87de11bdd21157436b5656557cd909a0943071046f3a17dd679aa1129b88b8b925f73113 WHIRLPOOL 60016eb5a20159bfc74b16c4135055cf8bf68bd868ef897b2455107a1014d4663efd55e6f5977e7d2e29010660a59d6134e3af32922d15dccbae07145c9023ea -DIST ceph-9.2.1.tar.gz 9933444 SHA256 1918dfc3df80df5986c5b7ff6bc6c78064eef0f6c5e8269dba30e08c703a7c2f SHA512 1e84c1e2d64f4156a523658ed11552b045f75986922b7b7dbaf4719e73a0a6aadc71eb2b94ae363526f729534a592921a437468a41a3cea88c1b84e09de8505a WHIRLPOOL 3a0eb6712e5b0235707e86129e1d66f1184f50cd4980c30f6d8cc0e7dfd96d30b91177ed16dd7abf2ad4983c6a543eb91915f74f661f7d3e3c810b5b1d656aca diff --git a/sys-cluster/ceph/ceph-0.94.9.ebuild b/sys-cluster/ceph/ceph-0.94.9.ebuild deleted file mode 100644 index 1d7eef4c590..00000000000 --- a/sys-cluster/ceph/ceph-0.94.9.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -if [[ $PV = *9999* ]]; then - scm_eclass=git-r3 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"; - SRC_URI="" -else - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"; - - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz - ${UPSTREAM_PATCHSET_URI}" -fi -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" - -inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo-r1 systemd ${scm_eclass} - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/"; - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc python tcmalloc xfs zfs" - -COMMON_DEPEND=" - app-arch/snappy - dev-libs/boost:=[threads] - dev-libs/fcgi - dev-libs/libaio - dev-libs/libedit - dev-libs/leveldb[snappy] - nss? ( dev-libs/nss ) - cryptopp? ( dev-libs/crypto++ ) - sys-apps/keyutils - sys-apps/util-linux - dev-libs/libxml2 - babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0 ) - libatomic? ( dev-libs/libatomic_ops ) - xfs? ( sys-fs/xfsprogs ) - zfs? ( sys-fs/zfs ) - gtk? ( - x11-libs/gtk+:2 - dev-cpp/gtkmm:2.4 - gnome-base/librsvg - ) - radosgw? ( - dev-libs/fcgi - dev-libs/expat - net-misc/curl - ) - jemalloc? ( dev-libs/jemalloc ) - !jemalloc? ( dev-util/google-perftools ) - lttng? ( dev-util/lttng-ust ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - sys-apps/hdparm - dev-python/flask[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ^^ ( nss cryptopp ) - ?? ( jemalloc tcmalloc ) - " - -STRIP_MASK="/usr/lib*/rados-classes/*" - -PATCHES=( - "${FILESDIR}"/${PN}-0.79-libzfs.patch -) -CHECKREQS_DISK_BUILD="1400M" - -pkg_setup() { - python_setup -} - -src_prepare() { - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Ceph Upstream patch set" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi - - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - - epatch_user - eautoreconf -} - -src_configure() { - local myeconfargs=( - --without-hadoop - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --includedir=/usr/include - $(use_with debug) - $(use_with fuse) - $(use_with libaio) - $(use_with libatomic libatomic-ops) - $(use_with nss) - $(use_with cryptopp) - $(use_with radosgw) - $(use_with gtk gtk2) - $(use_enable static-libs static) - $(use_with jemalloc) - $(use_with xfs libxfs) - $(use_with zfs libzfs) - $(use_with lttng ) - $(use_with babeltrace) - --without-kinetic - --without-librocksdb - ) - - use jemalloc || \ - myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") ) - - PYTHON="${EPYTHON}" \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - prune_libtool_files --all - - exeinto /usr/$(get_libdir)/ceph - newexe src/init-ceph ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate ${PN} - - chmod 644 "${ED}"/usr/share/doc/${PF}/sample.* - - keepdir /var/lib/${PN} - keepdir /var/lib/${PN}/tmp - keepdir /var/log/${PN}/stat - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r1.1" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - - systemd_dounit "${FILESDIR}/ceph.target" - systemd_newunit "${FILESDIR}/ceph-mds_at.service" "ceph-mds@.service" - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service" - systemd_newunit "${FILESDIR}/ceph-osd_at.service" "ceph-osd@.service" - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service" - systemd_newunit "${FILESDIR}/ceph-mon_at.service" "ceph-mon@.service" - - python_fix_shebang \ - "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \ - "${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-brag} - - #install udev rules - udev_dorules udev/50-rbd.rules - udev_dorules udev/95-ceph-osd.rules - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-10.2.8.ebuild b/sys-cluster/ceph/ceph-10.2.8.ebuild deleted file mode 100644 index 90cd7f880ef..00000000000 --- a/sys-cluster/ceph/ceph-10.2.8.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) - -inherit check-reqs autotools eutils python-r1 udev user \ - readme.gentoo-r1 systemd versionator flag-o-matic - -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" -SLOT="0" - -IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio" -IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs" - -# unbundling code commented out pending bugs 584056 and 584058 -#>=dev-libs/jerasure-2.0.0-r1 -#>=dev-libs/gf-complete-2.0.0 -COMMON_DEPEND=" - app-arch/snappy:= - sys-libs/zlib:= - app-arch/lz4:= - app-arch/bzip2:= - app-arch/zstd:= - dev-libs/boost:=[threads] - dev-libs/libaio:= - dev-libs/leveldb:=[snappy] - nss? ( dev-libs/nss:= ) - libatomic? ( dev-libs/libatomic_ops:= ) - cryptopp? ( dev-libs/crypto++:= ) - sys-apps/keyutils - sys-apps/util-linux - dev-libs/libxml2:= - radosgw? ( dev-libs/fcgi:= ) - ldap? ( net-nds/openldap:= ) - babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0= ) - xfs? ( sys-fs/xfsprogs:= ) - zfs? ( sys-fs/zfs:= ) - gtk? ( - x11-libs/gtk+:2= - dev-cpp/gtkmm:2.4 - gnome-base/librsvg:= - ) - radosgw? ( - dev-libs/fcgi:= - dev-libs/expat:= - net-misc/curl:= - ) - jemalloc? ( dev-libs/jemalloc:= ) - !jemalloc? ( dev-util/google-perftools ) - lttng? ( dev-util/lttng-ust:= ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - dev-python/cython[${PYTHON_USEDEP}] - app-arch/cpio - virtual/pkgconfig - dev-python/sphinx - test? ( - sys-fs/btrfs-progs - sys-apps/grep[pcre] - dev-python/tox[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - )" -RDEPEND="${COMMON_DEPEND} - sys-apps/hdparm - sys-block/parted - sys-fs/cryptsetup - sys-apps/gptfdisk - dev-python/flask[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - $(python_gen_useflags 'python2*') - ${PYTHON_REQUIRED_USE} - ^^ ( nss cryptopp ) - ?? ( jemalloc tcmalloc ) - " - -# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup') -REQUIRED_USE+=" radosgw" - -#RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -STRIP_MASK="/usr/lib*/rados-classes/*" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -PATCHES=( - "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch" - #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch" - "${FILESDIR}/${PN}-10.2.1-libzfs.patch" - "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch" - "${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch" - "${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch" - "${FILESDIR}/${PN}-10.2.7-fix-compilation-with-zstd.patch" -) - -check-reqs_export_vars() { - if use debug; then - CHECKREQS_DISK_BUILD="23G" - CHECKREQS_DISK_USR="7G" - elif use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="450M" - 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 -} - -emake_python_bindings() { - local action="${1}" params binding module - shift - params=("${@}") - - __emake_python_bindings_do_impl() { - ceph_run_econf "${EPYTHON}" - emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}" - - # these don't work and aren't needed on python3 - if [[ ${EBUILD_PHASE} == install ]]; then - for module in "${S}"/src/pybind/*.py; do - module_basename="$(basename "${module}")" - if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then - continue - elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then - python_domodule ${module} - fi - done - fi - } - - pushd "${S}/src" - for binding in rados rbd $(use cephfs && echo cephfs); do - python_foreach_impl __emake_python_bindings_do_impl - done - popd - - unset __emake_python_bindings_do_impl -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - default - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t - - #rm -rf "${UNBUNDLE_LIBS[@]}" - - append-flags -fPIC - eautoreconf -} - -src_configure() { - ECONFARGS=( - --without-hadoop - --includedir=/usr/include - $(use_with cephfs) - $(use_with debug) - $(use_with fuse) - $(use_with libaio) - $(use_with libatomic libatomic-ops) - $(use_with nss) - $(use_with cryptopp) - $(use_with radosgw) - $(use_with gtk gtk2) - $(use_enable static-libs static) - $(use_with jemalloc) - $(use_with xfs libxfs) - $(use_with zfs libzfs) - $(use_with lttng ) - $(use_with babeltrace) - $(use_with ldap openldap) - $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") - --with-mon - --with-eventfd - --with-cython - --without-kinetic - --without-librocksdb - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - # we can only use python2.7 for building at the moment - ceph_run_econf "python2*" -} - -ceph_run_econf() { - [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset" - [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation" - - pushd "${S}" >/dev/null || die - # - # This generates a QA warning about running econf in src_compile - # and src_install. Unfortunately the only other way to do this would - # involve building all of for each python implementation times, which - # wastes a _lot_ of CPU time and disk space. This hack will no longer - # be needed with >=ceph-11.2. - # - python_setup "${1}" - econf "${ECONFARGS[@]}" - - popd >/dev/null || die -} - -src_compile() { - emake - emake_python_bindings all - - use test && emake check-local -} - -src_test() { - make check || die "make check failed" -} - -src_install() { - default - emake_python_bindings install-exec "DESTDIR=\"${D}\"" - - prune_libtool_files --all - - exeinto /usr/$(get_libdir)/ceph - newexe src/init-ceph ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate ${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-r5" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} - - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service" - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service" - - udev_dorules udev/*.rules - - readme.gentoo_create_doc - - python_setup 'python2*' - 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/ceph-disk,bin/ceph-detect-init} || die "sed failed" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild b/sys-cluster/ceph/ceph-9.2.1-r2.ebuild deleted file mode 100644 index 529686284af..00000000000 --- a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -if [[ $PV = *9999* ]]; then - scm_eclass=git-r3 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"; - SRC_URI="" -else - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"; -fi -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" - -inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd versionator ${scm_eclass} - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/"; - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs" - -COMMON_DEPEND=" - app-arch/snappy - dev-libs/boost:=[threads] - dev-libs/fcgi - dev-libs/libaio - dev-libs/libedit - dev-libs/leveldb[snappy] - nss? ( dev-libs/nss ) - cryptopp? ( dev-libs/crypto++ ) - sys-apps/keyutils - sys-apps/util-linux - dev-libs/libxml2 - babeltrace? ( dev-util/babeltrace ) - fuse? ( sys-fs/fuse:0 ) - libatomic? ( dev-libs/libatomic_ops ) - xfs? ( sys-fs/xfsprogs ) - zfs? ( sys-fs/zfs ) - gtk? ( - x11-libs/gtk+:2 - dev-cpp/gtkmm:2.4 - gnome-base/librsvg - ) - radosgw? ( - dev-libs/fcgi - dev-libs/expat - net-misc/curl - ) - jemalloc? ( dev-libs/jemalloc ) - !jemalloc? ( dev-util/google-perftools ) - lttng? ( dev-util/lttng-ust ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - sys-apps/hdparm - dev-python/flask[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ^^ ( nss cryptopp ) - ?? ( jemalloc tcmalloc ) - " - -STRIP_MASK="/usr/lib*/rados-classes/*" - -PATCHES=( - "${FILESDIR}"/${PN}-0.79-libzfs.patch - "${FILESDIR}"/${P}-libxfs.patch -) - -check-reqs_export_vars() { - # check-reqs does not support use flags, and there is a lot of variability - # in Ceph. - # 16G /var/tmp/portage/sys-cluster/ceph-9999-r1/work/ceph-9999 - # 6.7G /var/tmp/portage/sys-cluster/ceph-9999-r1/image/usr - # 23G /var/tmp/portage/sys-cluster/ceph-9999-r1 - # Size requirements tested for Hammer & Jewel releases - if use debug; then - export CHECKREQS_DISK_BUILD="23G" - export CHECKREQS_DISK_USR="7G" - else - export CHECKREQS_DISK_BUILD="9G" - export CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_MEMORY="7G" -} - -user_setup() { - enewgroup ceph - enewuser ceph -1 -1 /var/lib/ceph ceph -} - -pkg_setup() { - python_setup - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - - epatch_user - eautoreconf -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -src_configure() { - local myeconfargs=( - --without-hadoop - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --includedir=/usr/include - $(use_with debug) - $(use_with fuse) - $(use_with libaio) - $(use_with libatomic libatomic-ops) - $(use_with nss) - $(use_with cryptopp) - $(use_with radosgw) - $(use_with gtk gtk2) - $(use_enable static-libs static) - $(use_with jemalloc) - $(use_with xfs libxfs) - $(use_with zfs libzfs) - $(use_with lttng ) - $(use_with babeltrace) - --without-kinetic - --without-librocksdb - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - use jemalloc || \ - myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") ) - - PYTHON="${EPYTHON}" \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - prune_libtool_files --all - - exeinto /usr/$(get_libdir)/ceph - newexe src/init-ceph ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate ${PN} - - chmod 644 "${ED}"/usr/share/doc/${PF}/sample.* - - keepdir /var/lib/${PN} - keepdir /var/lib/${PN}/tmp - keepdir /var/log/${PN}/stat - - fowners ceph:ceph /var/lib/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service" - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service" - - python_fix_shebang \ - "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \ - "${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag} - - #install udev rules - udev_dorules udev/50-rbd.rules - udev_dorules udev/95-ceph-osd.rules - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/files/ceph-0.79-libzfs.patch b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch deleted file mode 100644 index 6d79c178d43..00000000000 --- a/sys-cluster/ceph/files/ceph-0.79-libzfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/os/Makefile.am b/src/os/Makefile.am -index 252c678..c28ad0a 100644 ---- a/src/os/Makefile.am -+++ b/src/os/Makefile.am -@@ -61,7 +61,7 @@ noinst_HEADERS += \ - - if WITH_LIBZFS - libos_zfs_a_SOURCES = os/ZFS.cc --libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS} -+libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS} -I/usr/include/libzfs -I/usr/include/libspl - noinst_LIBRARIES += libos_zfs.a - noinst_HEADERS += os/ZFS.h - endif diff --git a/sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch b/sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch deleted file mode 100644 index 85515be3653..00000000000 --- a/sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 602425abd5cef741fc1b5d4d1dd70c68e153fc8d Mon Sep 17 00:00:00 2001 -From: Ira Cooper <i...@redhat.com> -Date: Thu, 31 Mar 2016 12:30:45 -0400 -Subject: [PATCH] configure: Add -D_LARGEFILE64_SOURCE to Linux build. - -Without -D_LARGEFILE64_SOURCE we can't build against libxfs, -because off64_t must be defined. - -Signed-off-by: Ira Cooper <i...@redhat.com> ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 48a7fc2..610c40b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,6 +63,7 @@ darwin*) - ;; - linux*) - linux="yes" -+ CFLAGS="-D_LARGEFILE64_SOURCE ${CFLAGS}" - ;; - freebsd*) - freebsd="yes" --- -2.8.4 -
