commit: bc018a7ff575ba82b26f201778bcfa86dad84262 Author: Michael Weber <michael <AT> xmw <DOT> de> AuthorDate: Mon Mar 2 14:19:13 2015 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Mon Mar 2 14:19:13 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=bc018a7f
Version bump (bug 536472) Package-Manager: portage-2.2.17 Manifest-Sign-Key: 62EEF090 --- sys-cluster/ceph/ChangeLog | 5 + sys-cluster/ceph/Manifest | 13 +++ sys-cluster/ceph/ceph-0.87.ebuild | 142 +++++++++++++++++++++++++ sys-cluster/ceph/files/ceph-0.79-libzfs.patch | 13 +++ sys-cluster/ceph/files/ceph-fix-gnustack.patch | 22 ++++ sys-cluster/ceph/metadata.xml | 23 ++++ 6 files changed, 218 insertions(+) diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog new file mode 100644 index 0000000..81a3e9d --- /dev/null +++ b/sys-cluster/ceph/ChangeLog @@ -0,0 +1,5 @@ +*ceph-0.87 (02 Mar 2015) + + 02 Mar 2015; Michael Weber <[email protected]> +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 new file mode 100644 index 0000000..f5072f8 --- /dev/null +++ b/sys-cluster/ceph/Manifest @@ -0,0 +1,13 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST ceph-0.87.tar.bz2 5819214 SHA256 6ca61e32c6b04f92d68f735408a981f95da699a65845908e5617b25defe90b32 SHA512 76f2fc58b3af6810d44196fa2c644357b6a279f2d288e9a4eb2d7a832421ea6f22073926ab5aaf319f3f1d1461be9ca7326278adbfc11cfa156a62ec6e76d1e4 WHIRLPOOL 2ff85d00a83611f59375e615de256b5104be77499f579a7538981de44da891bda398c27dda44ff763ae7cc053172dba0d253b3e3b5f408759a31700bb9743a27 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iL4EAREIAGYFAlT0cWFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky +N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBrBgD+OX43rNSZZbFUuKG7L03gTPOw +FLRdKRH6ghk75l3B/zQA/RZu6+lekheOi54k+vhPG2eYrnQp1wY1uDlWwpATZqkC +=AX1y +-----END PGP SIGNATURE----- diff --git a/sys-cluster/ceph/ceph-0.87.ebuild b/sys-cluster/ceph/ceph-0.87.ebuild new file mode 100644 index 0000000..3769bd8 --- /dev/null +++ b/sys-cluster/ceph/ceph-0.87.ebuild @@ -0,0 +1,142 @@ +# 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="~amd64 ~x86" +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="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs" + +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 + 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 ) + $(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 ) + " + +STRIP_MASK="/usr/lib*/rados-classes/*" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-gnustack.patch + "${FILESDIR}"/${PN}-0.79-libzfs.patch +) + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + + 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 xfs libxfs) \ + $(use_with zfs libzfs) \ + --with-kinetic \ + --with-librocksdb \ + --with-lttng \ + --with-babeltrace +} + +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/ceph-0.79-libzfs.patch b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch new file mode 100644 index 0000000..6d79c17 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch @@ -0,0 +1,13 @@ +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-fix-gnustack.patch b/sys-cluster/ceph/files/ceph-fix-gnustack.patch new file mode 100644 index 0000000..3e2eace --- /dev/null +++ b/sys-cluster/ceph/files/ceph-fix-gnustack.patch @@ -0,0 +1,22 @@ +diff --git a/src/common/crc32c_intel_fast_asm.S b/src/common/crc32c_intel_fast_asm.S +index 4ca5d65..68d3426 100644 +--- a/src/common/crc32c_intel_fast_asm.S ++++ b/src/common/crc32c_intel_fast_asm.S +@@ -662,3 +662,6 @@ global %1_slver + %endmacro + ;;; func core, ver, snum + slversion crc32_iscsi_00, 00, 02, 0014 ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endiF +diff --git a/src/common/crc32c_intel_fast_zero_asm.S b/src/common/crc32c_intel_fast_zero_asm.S +index b7246f2..9728be9 100644 +--- a/src/common/crc32c_intel_fast_zero_asm.S ++++ b/src/common/crc32c_intel_fast_zero_asm.S +@@ -644,3 +644,6 @@ global %1_slver + %endmacro + ;;; func core, ver, snum + slversion crc32_iscsi_zero_00, 00, 02, 0014 ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endiF diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml new file mode 100644 index 0000000..ef95520 --- /dev/null +++ b/sys-cluster/ceph/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <herd>cluster</herd> + <maintainer> + <email>[email protected]</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='libaio'>Use libaio as asynchronous input/output library</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='zfs'>Add zfs support</flag> +</use> +</pkgmetadata>
