commit: 81b71577c7605a71abde5dbfb15a0174e1aed12a Author: Michael Weber <michael <AT> xmw <DOT> de> AuthorDate: Tue Aug 11 09:35:00 2015 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Tue Aug 11 09:35:00 2015 +0000 URL: https://gitweb.gentoo.org/dev/xmw.git/commit/?id=81b71577
sys-cluster/ceph: superseeded in tree. sys-cluster/ceph/ChangeLog | 30 ----- sys-cluster/ceph/Manifest | 11 -- sys-cluster/ceph/ceph-0.93.ebuild | 154 ------------------------ sys-cluster/ceph/files/README.gentoo | 18 --- sys-cluster/ceph/files/ceph-0.79-libzfs.patch | 13 -- sys-cluster/ceph/files/ceph-0.87.1-stdint.patch | 40 ------ sys-cluster/ceph/files/ceph.confd-r1 | 4 - sys-cluster/ceph/files/ceph.initd-r1 | 48 -------- sys-cluster/ceph/files/ceph.logrotate | 22 ---- sys-cluster/ceph/metadata.xml | 27 ----- 10 files changed, 367 deletions(-) diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog deleted file mode 100644 index a452dc5..0000000 --- a/sys-cluster/ceph/ChangeLog +++ /dev/null @@ -1,30 +0,0 @@ - 04 Mar 2015; Michael Weber <x...@gentoo.org> ceph-0.93.ebuild: - Drop keywords - - 04 Mar 2015; Michael Weber <x...@gentoo.org> -ceph-0.80.8.ebuild, - -ceph-0.87.1.ebuild: - Ebuilds moved to tree - -*ceph-0.80.8 (03 Mar 2015) -*ceph-0.93 (03 Mar 2015) - - 03 Mar 2015; Michael Weber <x...@gentoo.org> +ceph-0.80.8.ebuild, - +ceph-0.93.ebuild, ceph-0.87.1.ebuild, metadata.xml: - Add 0.93 and 0.80.8. - - 02 Mar 2015; Michael Weber <x...@gentoo.org> +files/README.gentoo, - +files/ceph-0.87.1-stdint.patch, +files/ceph.confd-r1, +files/ceph.initd-r1, - +files/ceph.logrotate, ceph-0.87.1.ebuild, metadata.xml: - Drop USE=rocksdb and USE=kinetic for now. - -*ceph-0.87.1 (02 Mar 2015) - - 02 Mar 2015; Michael Weber <x...@gentoo.org> +ceph-0.87.1.ebuild, - -ceph-0.87.ebuild, -files/ceph-fix-gnustack.patch, metadata.xml: - Version bump with new use flags - -*ceph-0.87 (02 Mar 2015) - - 02 Mar 2015; Michael Weber <x...@gentoo.org> +ceph-0.87.ebuild, - +files/ceph-0.79-libzfs.patch, +files/ceph-fix-gnustack.patch, +metadata.xml: - Version bump (bug 536472) diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest deleted file mode 100644 index ebf2cf9..0000000 --- a/sys-cluster/ceph/Manifest +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST ceph-0.93.tar.bz2 7008770 SHA256 36174c47f52b0db1f0ee081a72040349052b07f477f2d97a2f5a2bf1727c0fe4 SHA512 3587deb4c38717d933f91ac4219317f0f36b71f08a0cb9698b2452a8427d7ace2b4a82a0883728d4c4990ccab1dd60cb911c4e1f380cb6241a1228ba89c7dfa3 WHIRLPOOL 5df04619f949674fad921c06dc401cbbfbcc5deb126c0f0b36f5e70a55dc4c7cb6384622c57327e4346c081f8648935d6b08840cb87cb3ac453731459f7ea60f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlT3Fy4ACgkQknrdDGLu8JBkGQD5AVBGzzfVMQaXL2f8tgLskrM0 -v9GxP7vo3KEjSfsJ9iwA/i3UgkxGQmkhtm4B/omMnvMXO4Hox/OaaQGkuqBzSjNK -=Tt1f ------END PGP SIGNATURE----- diff --git a/sys-cluster/ceph/ceph-0.93.ebuild b/sys-cluster/ceph/ceph-0.93.ebuild deleted file mode 100644 index 034b327..0000000 --- a/sys-cluster/ceph/ceph-0.93.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.80.7.ebuild,v 1.1 2014/11/05 07:04:12 dlan Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) - -if [[ $PV = *9999* ]]; then - scm_eclass=git-r3 - EGIT_REPO_URI=" - git://github.com/ceph/ceph.git - https://github.com/ceph/ceph.git" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="http://ceph.com/download/${P}.tar.bz2" - KEYWORDS="" -fi - -inherit autotools eutils multilib python-any-r1 udev readme.gentoo ${scm_eclass} - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="http://ceph.com/" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="babeltrace cryptopp debug fuse gtk jemalloc libatomic +libaio lttng +nss radosgw static-libs tcmalloc xfs xio zfs" - -# packages not in gentoo: -# --with-kinetic requires Seagate kinetic API -# --with-rocksdb requires http://rocksdb.org/ -CDEPEND=" - 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 ) - 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 - ) - tcmalloc? ( dev-util/google-perftools ) - jemalloc? ( dev-libs/jemalloc ) - lttng? ( dev-util/lttng-ust ) - $(python_gen_any_dep ' - ' ) - ${PYTHON_DEPS} - " -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - sys-apps/hdparm - $(python_gen_any_dep ' - dev-python/flask[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ' )" -REQUIRED_USE=" - ^^ ( nss cryptopp ) - jemalloc? ( tcmalloc ) - " - -STRIP_MASK="/usr/lib*/rados-classes/*" - -PATCHES=( - "${FILESDIR}"/${PN}-0.79-libzfs.patch -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - - sed -e '1i#include <stdint.h>' \ - -i src/tracing/{objectstore,oprequest,osd,pg}.tp || die - - epatch_user - eautoreconf -} - -src_configure() { - econf \ - --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 tcmalloc) \ - $(use_with jemalloc) \ - $(use_with xfs libxfs) \ - $(use_with zfs libzfs) \ - --without-kinetic \ - --without-librocksdb \ - $(use_with lttng ) \ - $(use_with babeltrace) \ - --enable-root-make-check \ - $(use_enable xio) -} - -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}/${PN}.initd-r1" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} - - python_fix_shebang \ - "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \ - "${ED}"/usr/bin/{ceph,ceph-rest-api} - - #install udev rules - udev_dorules udev/50-rbd.rules - udev_dorules udev/95-ceph-osd.rules - - readme.gentoo_create_doc -} diff --git a/sys-cluster/ceph/files/README.gentoo b/sys-cluster/ceph/files/README.gentoo deleted file mode 100644 index b049515..0000000 --- a/sys-cluster/ceph/files/README.gentoo +++ /dev/null @@ -1,18 +0,0 @@ -1) We'd suggest you to install following packages - sys-block/parted to manage disk partions - sys-fs/btrfs-progs to use btrfs filesytem - sys-fs/cryptsetup to use encrypted devices with dm-crypt - -2) To start several daemons of one specific type, create your own scripts - cd /etc/init.d - for dmn in mds.a mon.a osd.0 osd.1 osd.2; do - ln -s ceph ceph-${dmn}; - rc-update add ceph-${dmn} default; - done - -3) If you spread ceph daemons over several different machines, - We'd highly recommend you to start ntp-client to keep the system time sync. - Try to choose one of following ntp client to install and add into runlevel. - net-misc/ntp - net-misc/openntpd - net-misc/chrony 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 6d79c17..0000000 --- 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-0.87.1-stdint.patch b/sys-cluster/ceph/files/ceph-0.87.1-stdint.patch deleted file mode 100644 index 6697940..0000000 --- a/sys-cluster/ceph/files/ceph-0.87.1-stdint.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- ceph-0.87.1/src/tracing/objectstore.h -+++ ceph-0.87.1/src/tracing/objectstore.h -@@ -9,6 +9,7 @@ - #define OBJECTSTORE_H - - #include <lttng/tracepoint.h> -+#include <stdint.h> - - TRACEPOINT_EVENT(objectstore, exists_enter, - TP_ARGS( ---- ceph-0.87.1/src/tracing/oprequest.h -+++ ceph-0.87.1/src/tracing/oprequest.h -@@ -9,6 +9,7 @@ - #define OPREQUEST_H - - #include <lttng/tracepoint.h> -+#include <stdint.h> - - TRACEPOINT_EVENT(oprequest, set_rmw_flags, - TP_ARGS( ---- ceph-0.87.1/src/tracing/osd.h -+++ ceph-0.87.1/src/tracing/osd.h -@@ -9,6 +8,7 @@ - #define OSD_H - - #include <lttng/tracepoint.h> -+#include <stdint.h> - - TRACEPOINT_EVENT(osd, prepare_tx_enter, - TP_ARGS( ---- ceph-0.87.1/src/tracing/pg.h -+++ ceph-0.87.1/src/tracing/pg.h -@@ -9,6 +9,7 @@ - #define PG_H - - #include <lttng/tracepoint.h> -+#include <stdint.h> - - TRACEPOINT_EVENT(pg, queue_op, - TP_ARGS( diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1 deleted file mode 100644 index 3bdb8b4..0000000 --- a/sys-cluster/ceph/files/ceph.confd-r1 +++ /dev/null @@ -1,4 +0,0 @@ -# Example - -# default ceph conf file -#ceph_conf="/etc/ceph/ceph.conf" diff --git a/sys-cluster/ceph/files/ceph.initd-r1 b/sys-cluster/ceph/files/ceph.initd-r1 deleted file mode 100644 index ca5ab60..0000000 --- a/sys-cluster/ceph/files/ceph.initd-r1 +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/runscript - -ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" -extra_commands="reload" -type=${RC_SVCNAME:5:3} -id=${RC_SVCNAME:9} -id=${id:-"0"} -command="/usr/bin/ceph-${type}" -pidfile="/run/ceph/${type}.${id}.pid" -command_args="-i ${id} --pid-file ${pidfile} -c ${ceph_conf}" - -depend() { - after net ntpd ntp-client chronyd - before netmount -} - -is_type_valid() { - case ${type} in - mon|mds|osd) return 0;; - *) return 1;; - esac -} - -start_pre() { - checkpath -d -q $(dirname ${pidfile}) -} - -start() { - ebegin "Starting Ceph ${type}.${id}" - if ! is_type_valid ;then - eerror "Please give valid Ceph Server Type: mds, mon, osd" - return 1 - fi - ${command} ${command_args} - eend $? -} - -stop() { - ebegin "Stopping Ceph ${type}.${id}" - start-stop-daemon --stop --pidfile ${pidfile} - eend $? -} - -reload() { - ebegin "Reloading Ceph ${type}.${id}" - start-stop-daemon --signal 1 --pidfile ${pidfile} - eend $? -} diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate deleted file mode 100644 index ff50cd9..0000000 --- a/sys-cluster/ceph/files/ceph.logrotate +++ /dev/null @@ -1,22 +0,0 @@ -/var/log/ceph/admin.log -/var/log/ceph/ceph.log -/var/log/ceph/ceph-mon.* -/var/log/ceph/ceph-mds.* -/var/log/ceph/ceph-osd.* -{ - rotate 7 - daily - compress - sharedscripts - prerotate - for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do - ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null - done - endscript - postrotate - for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do - ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null - done - endscript - missingok -} diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml deleted file mode 100644 index 6da5dfe..0000000 --- a/sys-cluster/ceph/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>cluster</herd> - <maintainer> - <email>d...@gentoo.org</email> - <name>Yixun Lan</name> - <description>Co Maintainer</description> - </maintainer> -<longdescription> -Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. -</longdescription> -<use> - <flag name='cryptopp'>Use <pkg>dev-libs/crypto++</pkg> for cryptography</flag> - <flag name='fuse'>Build fuse client</flag> - <flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag> - <flag name='jemalloc'>Enable jemalloc for memory allocations</flag> - <flag name='libaio'>Use libaio as asynchronous input/output library</flag> - <flag name='lttng'>Add support for LTTng</flag> - <flag name='babeltrace'>Add support for LTTng babeltrace</flag> - <flag name='nss'>Use <pkg>dev-libs/nss</pkg> for cryptography</flag> - <flag name='radosgw'>Add radosgw support</flag> - <flag name='xfs'>Add xfs support</flag> - <flag name='xio'>Build Ceph Accelio transport</flag> - <flag name='zfs'>Add zfs support</flag> -</use> -</pkgmetadata>