From 794dbb3681f4a4d27783ff7d82ae4ad9a2018fff Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sun, 21 Nov 2010 18:56:20 +0000 Subject: Add support for glusterd wrt #345427 by Thomas Merkel . All work done by Ultrabug . Drop old (Portage version: 2.1.9.24/cvs/Linux x86_64) --- sys-cluster/glusterfs/ChangeLog | 9 +- sys-cluster/glusterfs/files/glusterd.initd | 36 ++++++++ sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild | 108 ++++++++++++++++++++++++ sys-cluster/glusterfs/glusterfs-3.1.0.ebuild | 102 ---------------------- 4 files changed, 152 insertions(+), 103 deletions(-) create mode 100644 sys-cluster/glusterfs/files/glusterd.initd create mode 100644 sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild delete mode 100644 sys-cluster/glusterfs/glusterfs-3.1.0.ebuild (limited to 'sys-cluster/glusterfs') diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog index 7143b4f99f5e..3a2d0785e75b 100644 --- a/sys-cluster/glusterfs/ChangeLog +++ b/sys-cluster/glusterfs/ChangeLog @@ -1,6 +1,13 @@ # 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.12 2010/10/14 17:09:17 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.13 2010/11/21 18:56:20 xarthisius Exp $ + +*glusterfs-3.1.0-r1 (21 Nov 2010) + + 21 Nov 2010; Kacper Kowalik -glusterfs-3.1.0.ebuild, + +glusterfs-3.1.0-r1.ebuild, +files/glusterd.initd: + Add support for glusterd wrt #345427 by Thomas Merkel . All work + done by Ultrabug . Drop old *glusterfs-3.1.0 (14 Oct 2010) diff --git a/sys-cluster/glusterfs/files/glusterd.initd b/sys-cluster/glusterfs/files/glusterd.initd new file mode 100644 index 000000000000..1cd09f9d691b --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterd.initd @@ -0,0 +1,36 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/files/glusterd.initd,v 1.1 2010/11/21 18:56:20 xarthisius Exp $ + +PIDFILE=/var/run/glusterd.pid + +depend() { + need net + before netmount +} + +start() { + ebegin "Starting glusterd" + start-stop-daemon --start -q --exec /usr/sbin/glusterd \ + --pidfile "${PIDFILE}" --make-pidfile --background \ + -- -N + eend $? +} + +stop() { + ebegin "Stopping glusterd" + start-stop-daemon --stop -q --pidfile "${PIDFILE}" + eindent + + einfo "Unmounting GlusterFS filesystems" + umount -t fuse.glusterfs -a + + einfo "Killing remaining GlusterFS processes" + for PID in $(find /var/lib/glusterd/ -type f -name "*.pid" -exec cat {} \;); do + kill "${PID}" + done + + eoutdent + eend $? +} diff --git a/sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild new file mode 100644 index 000000000000..a49d690a1691 --- /dev/null +++ b/sys-cluster/glusterfs/glusterfs-3.1.0-r1.ebuild @@ -0,0 +1,108 @@ +# 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.1.0-r1.ebuild,v 1.1 2010/11/21 18:56:20 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 extras +fuse infiniband static-libs vim-syntax" + +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" \ + "${FILESDIR}/glusterd-workdir.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 + newinitd "${FILESDIR}/glusterd.initd" glusterd || die + newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die + + keepdir /var/log/${PN} || die + keepdir /var/lib/glusterd || die +} + +pkg_postinst() { + elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" + elog "volumes dynamically. To do so, simply use the gluster CLI after running:" + elog " /etc/init.d/glusterd start" + elog + elog "For static configurations, the glusterfsd startup script can be multiplexed." + elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" + elog "separate service. To create additional instances of the glusterfsd service" + elog "simply create a symlink to the glusterfsd 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" + elog + elog "For more information on how to mount exported GlusterFS filesystems visit:" + elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume" + elog + elog "If you are upgrading from glusterfs 3.0.x please read:" + elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.1_Upgrade_Guide" + elog + 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/glusterfs-3.1.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild deleted file mode 100644 index 669bdb09f9f1..000000000000 --- a/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# 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.1.0.ebuild,v 1.1 2010/10/14 17:09:17 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 - elog "If you are upgrading from glusterfs 3.0.x please read:" - elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.1_Upgrade_Guide" - 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 -} -- cgit v1.2.3-65-gdbad