diff options
author | Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> | 2010-10-14 14:32:08 +0200 |
---|---|---|
committer | Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> | 2010-10-14 14:32:08 +0200 |
commit | 59d6f63ecc3ea84663ea5710f547e8ee7a8b4ceb (patch) | |
tree | 6116ba9edfb46eed2025ac0e82ed46dbfc372229 | |
parent | x11-misc/bbacpi: fix deps, install man (diff) | |
download | xarthisius-59d6f63ecc3ea84663ea5710f547e8ee7a8b4ceb.tar.gz xarthisius-59d6f63ecc3ea84663ea5710f547e8ee7a8b4ceb.tar.bz2 xarthisius-59d6f63ecc3ea84663ea5710f547e8ee7a8b4ceb.zip |
sys-cluster/glusterfs: version bump
-rw-r--r-- | sys-cluster/glusterfs/ChangeLog | 57 | ||||
-rw-r--r-- | sys-cluster/glusterfs/Manifest | 10 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el | 5 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs-2.0.8-docdir.patch | 51 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch | 22 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs.confd | 6 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs.initd | 120 | ||||
-rw-r--r-- | sys-cluster/glusterfs/files/glusterfs.vim | 8 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-3.1.0.ebuild | 99 | ||||
-rw-r--r-- | sys-cluster/glusterfs/metadata.xml | 18 |
10 files changed, 396 insertions, 0 deletions
diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog new file mode 100644 index 0000000..7dd24f0 --- /dev/null +++ b/sys-cluster/glusterfs/ChangeLog @@ -0,0 +1,57 @@ +# ChangeLog for sys-cluster/glusterfs +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.11 2010/08/09 15:17:09 xarthisius Exp $ + +*glusterfs-3.0.5 (09 Aug 2010) + + 09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> + -glusterfs-3.0.2.ebuild, +glusterfs-3.0.5.ebuild, metadata.xml: + Version bump wrt bug 330603. Thanks to Aleksandr Yakimov + <yaleks@gentoo.ru> for report. Update metadata.xml and remove old. + +*glusterfs-3.0.4 (08 May 2010) + + 08 May 2010; Alexey Shvetsov <alexxy@gentoo.org> +glusterfs-3.0.4.ebuild: + Version bump per bug #311467 + +*glusterfs-3.0.2 (22 Feb 2010) + + 22 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org> -glusterfs-2.0.8.ebuild, + -glusterfs-3.0.0.ebuild, +glusterfs-3.0.2.ebuild: + Version bump per bug #304261 + + 05 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org> glusterfs-3.0.0.ebuild: + Fix bug #300122 + +*glusterfs-3.0.0 (14 Dec 2009) + + 14 Dec 2009; Alexey Shvetsov <alexxy@gentoo.org> +glusterfs-3.0.0.ebuild: + Version bump + + 02 Dec 2009; Alexey Shvetsov <alexxy@gentoo.org> files/glusterfs.initd: + Update init.d as asked by Elvanor + + 25 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> glusterfs-2.0.8.ebuild: + Update infiniband deps + +*glusterfs-2.0.8 (25 Nov 2009) + + 25 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> +glusterfs-2.0.8.ebuild, + metadata.xml: + Version bump per bug #290713 + + 23 Sep 2009; Alexey Shvetsov <alexxy@gentoo.org> glusterfs-2.0.6.ebuild: + Drop berkdb support since its unstable for current glusterfs version + + 22 Sep 2009; Alexey Shvetsov <alexxy@gentoo.org> files/glusterfs.initd: + Update init script + +*glusterfs-2.0.6 (22 Sep 2009) + + 22 Sep 2009; Alexey Shvetsov <alexxy@gentoo.org> + +files/50glusterfs-mode-gentoo.el, +glusterfs-2.0.6.ebuild, + +files/glusterfs-2.0.6-docdir.patch, + +files/glusterfs-2.0.6-parallel-make.patch, +files/glusterfs.confd, + +files/glusterfs.initd, +files/glusterfs.vim, +metadata.xml: + Version bump per bug #167955 + diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest new file mode 100644 index 0000000..38951fa --- /dev/null +++ b/sys-cluster/glusterfs/Manifest @@ -0,0 +1,10 @@ +AUX 50glusterfs-mode-gentoo.el 169 RMD160 406c0dd2d79d054f059fcae29961fb6b7950e367 SHA1 5cb956b94b2704d244a4031093305de3243a7a86 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d +AUX glusterfs-2.0.8-docdir.patch 1644 RMD160 6961d29068c6b556f195615b789188f28e80b181 SHA1 4ff29870fae0039f390945ccaee3bcd25c87ae70 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 +AUX glusterfs-3.1.0-parallel-build.patch 659 RMD160 a5127f529387a0f9a543c666d139beac6f8b306c SHA1 bf1d566d9b306b44f0a26db7d2c9ddaa10f8a872 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c +AUX glusterfs.confd 129 RMD160 ba0a6f22452b70cb3a7eb6f3bdd2b06e7c441b04 SHA1 c83f9e5c0becaf798b30b1709ea7086b56dd2992 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d +AUX glusterfs.initd 3134 RMD160 6606d3c3ee825e1af9624d66f5a46e30270e73a3 SHA1 68fcfa5b64dc6b133036b645c64ba75a7afbc126 SHA256 ffa622d26add72dafc1b1f8e6de716b14a6d99911888a344dc7d236fb7667d6e +AUX glusterfs.vim 139 RMD160 17a4589550934fd8fd3523d0075af7686fc8f905 SHA1 8aa880c49a7bd1a0e185539acede53840b138746 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 +DIST glusterfs-3.1.0.tar.gz 2043401 RMD160 96f8944cfe41f7d5a7971010ea47283c26998821 SHA1 b783b7be68f890684fbdc45b96bc30b092de692c SHA256 47c7d8f53f46c0a9c77bad7c1e098b63be2a9c128b379e409c81a1f37ec17da7 +EBUILD glusterfs-3.1.0.ebuild 3072 RMD160 66a457d440b2d597115ee0170318fb7296311e58 SHA1 3d4835ba452f4010c40635318a154e904c26909f SHA256 7d84f5f14234062f982eabb9577ff0b7716e5b47d7cd99087ab8538b2957487a +MISC ChangeLog 2011 RMD160 236797bfb32aeededf8d56dbdfc305a7616eed76 SHA1 e34d04162e2834cfbaeaa84b307a704a50236e08 SHA256 c3aab6b3e79b6af2050f669aeb163626db1b5fa82fbe1fd5c9435c571e467c36 +MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04 diff --git a/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el b/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el new file mode 100644 index 0000000..c14b0d8 --- /dev/null +++ b/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el @@ -0,0 +1,5 @@ + +;;; puppet-mode site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(autoload 'glusterfs-mode "glusterfs-mode" "Major mode for editing glusterfs manifests") diff --git a/sys-cluster/glusterfs/files/glusterfs-2.0.8-docdir.patch b/sys-cluster/glusterfs/files/glusterfs-2.0.8-docdir.patch new file mode 100644 index 0000000..5e26f63 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-2.0.8-docdir.patch @@ -0,0 +1,51 @@ +From 6a17bb8523c4c7810bf7797371df22cfb259f7a7 Mon Sep 17 00:00:00 2001 +From: MATSUU Takuto <matsuu@gentoo.org> +Date: Sat, 16 May 2009 07:01:53 +0900 +Subject: [PATCH] Use the standard autoconf $docdir variable. + +--- + doc/examples/Makefile.am | 1 - + extras/Makefile.am | 3 +-- + extras/benchmarking/Makefile.am | 4 +--- + 3 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am +index b4c93f4..5296d83 100644 +--- a/doc/examples/Makefile.am ++++ b/doc/examples/Makefile.am +@@ -1,7 +1,6 @@ + EXTRA = README unify.vol replicate.vol stripe.vol protocol-client.vol protocol-server.vol posix-locks.vol trash.vol write-behind.vol io-threads.vol io-cache.vol read-ahead.vol filter.vol trace.vol + EXTRA_DIST = $(EXTRA) + +-docdir = $(datadir)/doc/$(PACKAGE_NAME) + Examplesdir = $(docdir)/examples + Examples_DATA = $(EXTRA) + +diff --git a/extras/Makefile.am b/extras/Makefile.am +index 9be3973..ea0b33d 100644 +--- a/extras/Makefile.am ++++ b/extras/Makefile.am +@@ -1,6 +1,5 @@ + +-docdir = $(datadir)/doc/glusterfs/ +-EditorModedir = $(docdir)/ ++EditorModedir = $(docdir) + EditorMode_DATA = glusterfs-mode.el glusterfs.vim + + SUBDIRS = init.d benchmarking +diff --git a/extras/benchmarking/Makefile.am b/extras/benchmarking/Makefile.am +index 04cc061..bfcc592 100644 +--- a/extras/benchmarking/Makefile.am ++++ b/extras/benchmarking/Makefile.am +@@ -1,7 +1,5 @@ + +-docdir = $(datadir)/doc/$(PACKAGE_NAME)/benchmarking +- +-benchmarkingdir = $(docdir) ++benchmarkingdir = $(docdir)/benchmarking + + benchmarking_DATA = rdd.c glfs-bm.c README launch-script.sh local-script.sh + +-- +1.6.3 + diff --git a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch new file mode 100644 index 0000000..9320c12 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch @@ -0,0 +1,22 @@ +--- glusterfsd/src/Makefile.am ++++ glusterfsd/src/Makefile.am +@@ -20,5 +20,6 @@ uninstall-local: + install-data-local: + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run + $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs ++ $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) + rm -f $(DESTDIR)$(sbindir)/glusterfs + ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs +--- libglusterfs/src/Makefile.am ++++ libglusterfs/src/Makefile.am +@@ -15,7 +15,9 @@ + graph.lex.c: graph.l y.tab.h + $(LEX) -t $(srcdir)/graph.l > $@ + +-y.tab.c y.tab.h: graph.y ++y.tab.c: y.tab.h ++ ++y.tab.h: graph.y + $(YACC) -d $(srcdir)/graph.y + + CLEANFILES = graph.lex.c y.tab.c y.tab.h diff --git a/sys-cluster/glusterfs/files/glusterfs.confd b/sys-cluster/glusterfs/files/glusterfs.confd new file mode 100644 index 0000000..257d0a8 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs.confd @@ -0,0 +1,6 @@ +#glusterfsd_mountpoint="" +#glusterfsd_log="" +#glusterfsd_vol="" +#glusterfsd_port="" +#glusterfsd_transport="" +#glusterfsd_opts="" diff --git a/sys-cluster/glusterfs/files/glusterfs.initd b/sys-cluster/glusterfs/files/glusterfs.initd new file mode 100644 index 0000000..49c3a94 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs.initd @@ -0,0 +1,120 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/files/glusterfs.initd,v 1.3 2009/12/02 21:37:33 alexxy Exp $ + +if [[ "${SVCNAME}" != "glusterfs" ]] +then + GLUSTERFS_NAME="${SVCNAME#glusterfs.}" +else + GLUSTERFS_NAME="glusterfs" +fi + +GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid" + +eval 'GLUSTERFS_LOGFILE="${'${GLUSTERFS_NAME}'_log:-/var/log/glusterfs/'${GLUSTERFS_NAME}'.log}"' +eval 'GLUSTERFS_VOLFILE="${'${GLUSTERFS_NAME}'_vol:-/etc/glusterfs/'${GLUSTERFS_NAME}'.vol}"' +eval 'GLUSTERFS_SERVER="${'${GLUSTERFS_NAME}'_server}"' +eval 'GLUSTERFS_PORT="${'${GLUSTERFS_NAME}'_port:-6996}"' +eval 'GLUSTERFS_TRANSPORT="${'${GLUSTERFS_NAME}'_transport:-socket}"' +eval 'GLUSTERFS_OPTS="${'${GLUSTERFS_NAME}'_opts}"' +eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"' + +depend() { + need net + [[ -n "${GLUSTERFS_MOUNTPOINT}" ]] && need fuse + use dns + before netmount + after firewall ntp-client ntpd +} + +checkconfig() { + if [[ -z "${GLUSTERFS_NAME}" ]] + then + eerror "The service name is not properly formatted." + return 1 + fi + + if [[ -z "${GLUSTERFS_SERVER}" ]] + then + if [[ -z "${GLUSTERFS_VOLFILE}" ]] + then + eerror "No GlusterFS volume file source has been defined. Edit /etc/conf.d/glusterfs" + eerror "and configure a volume file source for ${SVCNAME}." + return 1 + else + if [[ ! -f "${GLUSTERFS_VOLFILE}" ]] + then + eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}" + return 1 + fi + fi + fi + + if [[ -n "${GLUSTERFS_MOUNTPOINT}" && ! -d "${GLUSTERFS_MOUNTPOINT}" ]] + then + eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist." + return 1 + fi +} + +start() { + local status + + checkconfig || return 1 + + ebegin "Starting GlusterFS (${SVCNAME})" + eindent + + if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]] + then + einfo "Starting in server mode ..." + else + einfo "Starting in client mode. Mounting filesystem ..." + fi + + if [[ -n "${GLUSTERFS_SERVER}" ]] + then + einfo "Using server supplied volume file" + start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \ + --exec /usr/sbin/glusterfsd -- \ + --pid-file=${GLUSTERFS_PIDFILE} \ + --log-file=${GLUSTERFS_LOGFILE} \ + --volfile-server=${GLUSTERFS_SERVER} \ + --volfile-server-port=${GLUSTERFS_PORT} \ + --volfile-server-transport=${GLUSTERFS_TRANSPORT} \ + ${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT} + status="$?" + else + einfo "Using local volume file" + start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \ + --exec /usr/sbin/glusterfsd -- \ + --pid-file=${GLUSTERFS_PIDFILE} \ + --log-file=${GLUSTERFS_LOGFILE} \ + --volfile=${GLUSTERFS_VOLFILE} \ + ${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT} + status="$?" + fi + + eoutdent + eend ${status} +} + +stop() { + local status + + ebegin "Stopping GlusterFS (${SVCNAME})" + eindent + if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]] + then + einfo "Stopping server process ..." + start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE} + status="$?" + else + einfo "Unmounting ${GLUSTERFS_MOUNTPOINT} ..." + umount "${GLUSTERFS_MOUNTPOINT}" + status="$?" + fi + eoutdent + eend ${status} +} diff --git a/sys-cluster/glusterfs/files/glusterfs.vim b/sys-cluster/glusterfs/files/glusterfs.vim new file mode 100644 index 0000000..bbb9cb1 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs.vim @@ -0,0 +1,8 @@ +if &compatible || v:version < 603 + finish +endif + + +" GlusterFS Volume files +au BufNewFile,BufRead *.vol + \ set filetype=glusterfs diff --git a/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild new file mode 100644 index 0000000..53e1c47 --- /dev/null +++ b/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.0.5.ebuild,v 1.1 2010/08/09 15:17:09 xarthisius Exp $ + +EAPI="2" + +inherit autotools elisp-common eutils multilib versionator + +DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" +HOMEPAGE="http://www.gluster.org/" +SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="emacs +fuse infiniband static-libs vim-syntax extras" + +DEPEND="emacs? ( virtual/emacs ) + fuse? ( >=sys-fs/fuse-2.7.0 ) + infiniband? ( sys-infiniband/libibverbs )" +RDEPEND="${DEPEND}" + +SITEFILE="50${PN}-mode-gentoo.el" + +src_prepare() { + epatch "${FILESDIR}/${P}-parallel-build.patch" \ + "${FILESDIR}/${PN}-2.0.8-docdir.patch" + eautoreconf +} + +src_configure() { + econf \ + $(use_enable fuse fuse-client) \ + $(use_enable infiniband ibverbs) \ + $(use_enable static-libs static) \ + --disable-bdb \ + --docdir=/usr/share/doc/${PF} \ + --localstatedir=/var +} + +src_compile() { + emake || die + if use emacs ; then + elisp-compile extras/glusterfs-mode.el || die + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + + if use emacs ; then + elisp-install ${PN} extras/glusterfs-mode.el* || die + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim" || die + insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim || die + fi + + if use extras ; then + newbin extras/volgen/glusterfs-volgen glusterfs-volgen || die + newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die + newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || die + fi + + dodoc AUTHORS ChangeLog NEWS README THANKS || die + + newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die + newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die + + keepdir /var/log/${PN} || die +} + +pkg_postinst() { + elog "The glusterfs startup script can be multiplexed." + elog "The default startup script uses /etc/conf.d/glusterfs to configure the" + elog "separate service. To create additional instances of the glusterfs service" + elog "simply create a symlink to the glusterfs startup script." + elog + elog "Example:" + elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" + elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" + elog "You can now treat glusterfsd2 like any other service" + echo + elog "You can mount exported GlusterFS filesystems through /etc/fstab instead of" + elog "through a startup script instance. For more information visit:" + elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume" + echo + ewarn "You need to use a ntp client to keep the clocks synchronized across all" + ewarn "of your servers. Setup a NTP synchronizing service before attempting to" + ewarn "run GlusterFS." + + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml new file mode 100644 index 0000000..a6fcc09 --- /dev/null +++ b/sys-cluster/glusterfs/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>cluster</herd> + <maintainer> + <email>alexxy@gentoo.org</email> + <name>Alexey Shvetsov</name> + </maintainer> + <longdescription lang='en'> + GlusterFS is a cluster file-system capable of scaling to several peta-bytes. It aggregates various storage bricks over Infiniband RDMA or TCP/IP interconnect into one large parallel network file system. GlusterFS is based on a stackable user space design without compromising performance. + </longdescription> + <use> + <flag name='fuse'>Add FUSE mount helper</flag> + <flag name='extras'>Install extra helper scripts</flag> + <flag name='infiniband'>Add support for Infiniband ibverbs transport. + Libraries can be found in science overlay</flag> + </use> +</pkgmetadata> |