diff options
Diffstat (limited to 'sys-cluster/glusterfs')
| -rw-r--r-- | sys-cluster/glusterfs/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-cluster/glusterfs/files/glusterfs-r1.initd | 122 | ||||
| -rw-r--r-- | sys-cluster/glusterfs/glusterfs-3.3.0.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/glusterfs/glusterfs-3.3.1.ebuild (renamed from sys-cluster/glusterfs/glusterfs-3.2.6.ebuild) | 77 |
4 files changed, 174 insertions, 37 deletions
diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog index c660abf0a04b..16e2a2cde1ed 100644 --- a/sys-cluster/glusterfs/ChangeLog +++ b/sys-cluster/glusterfs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-cluster/glusterfs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.40 2012/09/29 15:38:34 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.41 2012/11/19 13:36:35 ultrabug Exp $ + +*glusterfs-3.3.1 (19 Nov 2012) + + 19 Nov 2012; Ultrabug <ultrabug@gentoo.org> +files/glusterfs-r1.initd, + -glusterfs-3.2.6.ebuild, +glusterfs-3.3.1.ebuild: + Version bump fix #439262, fix init script wrt #442464 thx to Denis Kaganovich 29 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org> glusterfs-3.3.0.ebuild: Show upgrade info unconditionally as REPLACING_VERSIONS doesn't seem to work diff --git a/sys-cluster/glusterfs/files/glusterfs-r1.initd b/sys-cluster/glusterfs/files/glusterfs-r1.initd new file mode 100644 index 000000000000..fd054bd4a56e --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-r1.initd @@ -0,0 +1,122 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/files/glusterfs-r1.initd,v 1.1 2012/11/19 13:36:35 ultrabug 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 daemon + + checkconfig || return 1 + + ebegin "Starting GlusterFS (${SVCNAME})" + eindent + + if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]] + then + einfo "Starting in server mode ..." + daemon="glusterfsd" + else + einfo "Starting in client mode. Mounting filesystem ..." + daemon="glusterfs" + fi + + if [[ -n "${GLUSTERFS_SERVER}" ]] + then + einfo "Using server supplied volume file" + start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \ + --exec /usr/sbin/${daemon} -- \ + --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/${daemon} -- \ + --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/glusterfs-3.3.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild index 34b5dfc4f0c3..be48c986f392 100644 --- a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild +++ b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.2 2012/09/29 15:38:34 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.3 2012/11/19 13:36:35 ultrabug Exp $ EAPI=4 @@ -119,7 +119,7 @@ pkg_postinst() { ewarn "of your servers. Setup a NTP synchronizing service before attempting to" ewarn "run GlusterFS." - elog + elog elog "You are upgrading from a previous version of ${PN}, please read:" elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/" diff --git a/sys-cluster/glusterfs/glusterfs-3.2.6.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.1.ebuild index 248227e1325f..b989c0b12e10 100644 --- a/sys-cluster/glusterfs/glusterfs-3.2.6.ebuild +++ b/sys-cluster/glusterfs/glusterfs-3.3.1.ebuild @@ -1,15 +1,17 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.2.6.ebuild,v 1.2 2012/05/04 07:20:30 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.1.ebuild,v 1.1 2012/11/19 13:36:35 ultrabug Exp $ EAPI=4 PYTHON_DEPEND="2" -inherit autotools elisp-common eutils multilib python versionator +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils elisp-common eutils multilib python 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" +SRC_URI="http://download.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" @@ -17,8 +19,8 @@ KEYWORDS="~amd64 ~x86" IUSE="emacs extras +fuse infiniband static-libs vim-syntax" RDEPEND="emacs? ( virtual/emacs ) - fuse? ( >=sys-fs/fuse-2.7.0 ) - infiniband? ( sys-infiniband/libibverbs )" + fuse? ( >=sys-fs/fuse-2.7.0 ) + infiniband? ( sys-infiniband/libibverbs )" DEPEND="${RDEPEND} virtual/pkgconfig sys-devel/bison @@ -26,39 +28,50 @@ DEPEND="${RDEPEND} SITEFILE="50${PN}-mode-gentoo.el" +PATCHES=( + "${FILESDIR}/${PN}-3.3.0-parallel-build.patch" + "${FILESDIR}/${PN}-3.3.0-docdir.patch" + "${FILESDIR}/${PN}-3.3.0-silent_rules.patch" + "${FILESDIR}/${PN}-3.3.0-avoid-version.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README THANKS ) + pkg_setup() { python_set_active_version 2 python_pkg_setup } src_prepare() { - epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \ - "${FILESDIR}/${PN}-docdir.patch" \ - "${FILESDIR}/glusterd-3.2.0-workdir.patch" - sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die - eautoreconf + sed -e "s/ -ggdb3//g" \ + -i argp-standalone/configure.ac || die + autotools-utils_src_prepare + cd argp-standalone && eautoreconf } src_configure() { - econf \ - $(use_enable fuse fuse-client) \ - $(use_enable infiniband ibverbs) \ - $(use_enable static-libs static) \ - --enable-georeplication \ - --disable-bdb \ - --docdir=/usr/share/doc/${PF} \ + local myeconfargs=( + --disable-dependency-tracking + --disable-silent-rules + $(use_enable fuse fuse-client) + $(use_enable infiniband ibverbs) + $(use_enable static-libs static) + --enable-georeplication + --docdir=/usr/share/doc/${PF} --localstatedir=/var + ) + autotools-utils_src_configure } src_compile() { - emake + autotools-utils_src_compile if use emacs ; then elisp-compile extras/glusterfs-mode.el || die fi } src_install() { - emake DESTDIR="${D}" install + autotools-utils_src_install if use emacs ; then elisp-install ${PN} extras/glusterfs-mode.el* || die @@ -66,20 +79,18 @@ src_install() { fi if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim" - insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim + insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim + insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim fi if use extras ; then - newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize - newbin extras/backend-cleanup.sh glusterfs-backend-cleanup - newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute - newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync + newbin extras/backend-xattr-sanitize.sh ${PN}-backend-xattr-sanitize + newbin extras/backend-cleanup.sh ${PN}-backend-cleanup + newbin extras/migrate-unify-to-distribute.sh ${PN}-migrate-unify-to-distribute + newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync fi - dodoc AUTHORS ChangeLog NEWS README THANKS - - newinitd "${FILESDIR}/${PN}.initd" glusterfsd + newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd newinitd "${FILESDIR}/glusterd.initd" glusterd newconfd "${FILESDIR}/${PN}.confd" glusterfsd @@ -105,14 +116,12 @@ pkg_postinst() { elog "You can now treat glusterfsd2 like any other service" 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 "of your servers. Setup a NTP synchronizing service before attempting to" ewarn "run GlusterFS." - if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then - elog - elog "You are upgrading from a previous version of ${PN}, please read:" - elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide" - fi + elog + elog "You are upgrading from a previous version of ${PN}, please read:" + elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/" use emacs && elisp-site-regen } |