From be5ea14caf91aecd1b753d426d9230e88b996dad Mon Sep 17 00:00:00 2001 From: Christian Zoffoli Date: Thu, 13 Nov 2008 18:56:18 +0000 Subject: Ebuild cleanup, version bump. (Portage version: 2.1.4.4) --- sys-cluster/cman/ChangeLog | 13 +- sys-cluster/cman/cman-1.02.00-r1.ebuild | 53 ------- sys-cluster/cman/cman-1.03.00.ebuild | 53 ------- sys-cluster/cman/cman-1.04.00.ebuild | 53 ------- sys-cluster/cman/cman-2.02.00-r1.ebuild | 105 ------------- sys-cluster/cman/cman-2.02.00.ebuild | 100 ------------ sys-cluster/cman/cman-2.03.09.ebuild | 99 ++++++++++++ .../cman/files/cman-1.03.00-compile-hack.patch | 11 -- .../cman/files/cman-1.03.00-qdisk-makefile.patch | 11 -- .../cman/files/cman-1.04.00-qdisk-makefile.patch | 11 -- sys-cluster/cman/files/cman-1.0x.conf | 24 --- sys-cluster/cman/files/cman-1.0x.rc | 171 --------------------- sys-cluster/cman/files/cman-2.02.00-include.patch | 20 --- sys-cluster/cman/files/qdiskd-1.0x.rc | 23 --- 14 files changed, 111 insertions(+), 636 deletions(-) delete mode 100644 sys-cluster/cman/cman-1.02.00-r1.ebuild delete mode 100644 sys-cluster/cman/cman-1.03.00.ebuild delete mode 100644 sys-cluster/cman/cman-1.04.00.ebuild delete mode 100644 sys-cluster/cman/cman-2.02.00-r1.ebuild delete mode 100644 sys-cluster/cman/cman-2.02.00.ebuild create mode 100644 sys-cluster/cman/cman-2.03.09.ebuild delete mode 100644 sys-cluster/cman/files/cman-1.03.00-compile-hack.patch delete mode 100644 sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch delete mode 100644 sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch delete mode 100644 sys-cluster/cman/files/cman-1.0x.conf delete mode 100755 sys-cluster/cman/files/cman-1.0x.rc delete mode 100644 sys-cluster/cman/files/cman-2.02.00-include.patch delete mode 100755 sys-cluster/cman/files/qdiskd-1.0x.rc (limited to 'sys-cluster') diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog index 5880b34dd348..9eed9e4ea0a3 100644 --- a/sys-cluster/cman/ChangeLog +++ b/sys-cluster/cman/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-cluster/cman # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.40 2008/03/23 16:10:53 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.41 2008/11/13 18:56:17 xmerlin Exp $ + +*cman-2.03.09 (13 Nov 2008) + + 13 Nov 2008; Christian Zoffoli -files/cman-1.0x.conf, + -files/cman-1.0x.rc, -files/qdiskd-1.0x.rc, + -files/cman-1.03.00-compile-hack.patch, + -files/cman-1.03.00-qdisk-makefile.patch, + -files/cman-1.04.00-qdisk-makefile.patch, -cman-1.02.00-r1.ebuild, + -cman-1.03.00.ebuild, -cman-1.04.00.ebuild, -cman-2.02.00.ebuild, + -cman-2.02.00-r1.ebuild, +cman-2.03.09.ebuild: + Ebuild cleanup, version bump. *cman-2.02.00-r1 (23 Mar 2008) diff --git a/sys-cluster/cman/cman-1.02.00-r1.ebuild b/sys-cluster/cman/cman-1.02.00-r1.ebuild deleted file mode 100644 index 2f025bc06153..000000000000 --- a/sys-cluster/cman/cman-1.02.00-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.02.00-r1.ebuild,v 1.6 2008/03/17 16:47:10 xmerlin Exp $ - -inherit eutils - -CLUSTER_RELEASE="1.02.00" -MY_P="cluster-${CLUSTER_RELEASE}" -CVS_RELEASE="20060713" - -DESCRIPTION="general-purpose symmetric cluster manager" -HOMEPAGE="http://sources.redhat.com/cluster/" -SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz - mirror://gentoo/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz - http://dev.gentoo.org/~xmerlin/gfs/${PN}-${PV}-${CVS_RELEASE}-cvs.patch.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86" -IUSE="" - -DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}* - =sys-cluster/cman-headers-${CLUSTER_RELEASE}*" - -RDEPEND="" - -S="${WORKDIR}/${MY_P}/${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die -} - -src_compile() { - ./configure || die "configure problem" - emake || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "install problem" - - newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die - newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die - - keepdir /etc/cluster || die -} - -pkg_postinst() { - einfo "" - einfo "Please add a cluster.conf in /etc/cluster ." - einfo "" -} diff --git a/sys-cluster/cman/cman-1.03.00.ebuild b/sys-cluster/cman/cman-1.03.00.ebuild deleted file mode 100644 index b66b6981f765..000000000000 --- a/sys-cluster/cman/cman-1.03.00.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.03.00.ebuild,v 1.8 2008/03/17 16:47:10 xmerlin Exp $ - -inherit eutils - -CLUSTER_RELEASE="1.03.00" -MY_P="cluster-${CLUSTER_RELEASE}" - -DESCRIPTION="general-purpose symmetric cluster manager" -HOMEPAGE="http://sources.redhat.com/cluster/" -SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ppc64 x86" -IUSE="" - -DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}* - =sys-cluster/cman-headers-${CLUSTER_RELEASE}*" - -RDEPEND="" - -S="${WORKDIR}/${MY_P}/${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.03.00-compile-hack.patch || die - epatch "${FILESDIR}"/${PN}-1.03.00-qdisk-makefile.patch || die -} - -src_compile() { - ./configure || die "configure problem" - emake -j1 || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "install problem" - - newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die - newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die - - newinitd "${FILESDIR}"/qdiskd-1.0x.rc qdiskd || die - - keepdir /etc/cluster || die -} - -pkg_postinst() { - einfo "" - einfo "Please add a cluster.conf in /etc/cluster ." - einfo "" -} diff --git a/sys-cluster/cman/cman-1.04.00.ebuild b/sys-cluster/cman/cman-1.04.00.ebuild deleted file mode 100644 index c80c92c430be..000000000000 --- a/sys-cluster/cman/cman-1.04.00.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.04.00.ebuild,v 1.6 2008/03/17 16:47:10 xmerlin Exp $ - -inherit eutils - -CLUSTER_RELEASE="1.04.00" -MY_P="cluster-${CLUSTER_RELEASE}" - -DESCRIPTION="general-purpose symmetric cluster manager" -HOMEPAGE="http://sources.redhat.com/cluster/" -SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="" - -DEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}* - =sys-cluster/cman-headers-${CLUSTER_RELEASE}*" - -RDEPEND="" - -S="${WORKDIR}/${MY_P}/${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/cman-1.03.00-compile-hack.patch || die - epatch "${FILESDIR}"/${P}-qdisk-makefile.patch || die -} - -src_compile() { - ./configure || die "configure problem" - emake -j1 || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "install problem" - - newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die - newconfd "${FILESDIR}"/${PN}-1.0x.conf ${PN} || die - - newinitd "${FILESDIR}"/qdiskd-1.0x.rc qdiskd || die - - keepdir /etc/cluster || die -} - -pkg_postinst() { - einfo "" - einfo "Please add a cluster.conf in /etc/cluster ." - einfo "" -} diff --git a/sys-cluster/cman/cman-2.02.00-r1.ebuild b/sys-cluster/cman/cman-2.02.00-r1.ebuild deleted file mode 100644 index 2b29efebf3d4..000000000000 --- a/sys-cluster/cman/cman-2.02.00-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.02.00-r1.ebuild,v 1.1 2008/03/23 16:10:53 xmerlin Exp $ - -inherit eutils versionator - -CVS_RELEASE="20080323" -CLUSTER_RELEASE="${PV}" -MY_P="cluster-${CLUSTER_RELEASE}" - -MAJ_PV="$(get_major_version)" -MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)" - -DESCRIPTION="general-purpose symmetric cluster manager" -HOMEPAGE="http://sources.redhat.com/cluster/" -SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz - mirror://gentoo/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2 - http://dev.gentoo.org/~xmerlin/gfs/gfs-${PV}-${CVS_RELEASE}-cvs.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=sys-kernel/linux-headers-2.6.23 - =sys-cluster/openais-0.80.3* - =sys-cluster/ccs-${CLUSTER_RELEASE}* - =sys-cluster/cman-lib-${CLUSTER_RELEASE}* - !sys-cluster/cman-headers - !sys-cluster/cman-kernel - !sys-cluster/dlm-headers - !sys-cluster/magma - !sys-cluster/magma-plugins - " - -RDEPEND="${DEPEND}" - -PDEPEND="=sys-cluster/dlm-${CLUSTER_RELEASE}* - =sys-cluster/fence-${CLUSTER_RELEASE}*" - -S="${WORKDIR}/${MY_P}/${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - - # fix the manual pages have executable bit - sed -i -e ' - /\tinstall -d/s/install/& -m 0755/; t - /\tinstall/s/install/& -m 0644/' \ - man/Makefile || die "failed patching man pages permission" - - (cd "${WORKDIR}"/${MY_P}; - epatch "${WORKDIR}"/gfs-2.02.00-20080323-cvs.patch || die - ) -} - -src_compile() { - (cd "${WORKDIR}"/${MY_P}; - ./configure \ - --cc=$(tc-getCC) \ - --cflags="-Wall" \ - --disable_kernel_check \ - --somajor="$MAJ_PV" \ - --sominor="$MIN_PV" \ - --cmanlibdir=/usr/lib \ - --cmanincdir=/usr/include \ - ) || die "configure problem" - - emake clean - emake -C cman_tool || die "compile problem" - emake -C daemon || die "compile problem" - env -u CFLAGS emake -C qdisk || die "compile problem" - emake -C init.d || die "compile problem" - emake -C man || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "install problem" - - # These were installed by cman-lib. - rm "${D}"/usr/lib/libcman.so.${PV} \ - "${D}"/usr/lib/libcman.a \ - "${D}"/usr/include/libcman.h \ - "${D}"/usr/lib/libcman.so.2 \ - "${D}"/usr/lib/libcman.so \ - || die "failed to cleanup extra files" - - newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die - newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die - newinitd "${FILESDIR}"/qdiskd-2.0x.rc qdiskd || die - - keepdir /etc/cluster || die -} - -pkg_postinst() { - einfo "" - einfo "Please add a cluster.conf in /etc/cluster/" - einfo "" - einfo "If you want to use cman and dlm 2.0x.00" - einfo "with 2.6.20 kernels you have to patch your" - einfo "kernel sources with:" - einfo "http://dev.gentoo.org/~xmerlin/gfs/dlm-gfs-2.6.20.patch.bz2" - einfo "" -} diff --git a/sys-cluster/cman/cman-2.02.00.ebuild b/sys-cluster/cman/cman-2.02.00.ebuild deleted file mode 100644 index 637ae87e1239..000000000000 --- a/sys-cluster/cman/cman-2.02.00.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.02.00.ebuild,v 1.2 2008/03/17 23:39:06 xmerlin Exp $ - -inherit eutils versionator - -CLUSTER_RELEASE="${PV}" -MY_P="cluster-${CLUSTER_RELEASE}" - -MAJ_PV="$(get_major_version)" -MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)" - -DESCRIPTION="general-purpose symmetric cluster manager" -HOMEPAGE="http://sources.redhat.com/cluster/" -SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=sys-kernel/linux-headers-2.6.23 - =sys-cluster/openais-0.82* - =sys-cluster/ccs-${CLUSTER_RELEASE}* - =sys-cluster/cman-lib-${CLUSTER_RELEASE}* - !sys-cluster/cman-headers - !sys-cluster/cman-kernel - !sys-cluster/dlm-headers - !sys-cluster/magma - !sys-cluster/magma-plugins - " - -RDEPEND="${DEPEND}" - -PDEPEND="=sys-cluster/dlm-${CLUSTER_RELEASE}* - =sys-cluster/fence-${CLUSTER_RELEASE}*" - -S="${WORKDIR}/${MY_P}/${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - - # fix the manual pages have executable bit - sed -i -e ' - /\tinstall -d/s/install/& -m 0755/; t - /\tinstall/s/install/& -m 0644/' \ - man/Makefile || die "failed patching man pages permission" - - epatch "${FILESDIR}"/${P}-include.patch || die -} - -src_compile() { - (cd "${WORKDIR}"/${MY_P}; - ./configure \ - --cc=$(tc-getCC) \ - --cflags="-Wall" \ - --disable_kernel_check \ - --release_major="$MAJ_PV" \ - --release_minor="$MIN_PV" \ - --cmanlibdir=/usr/lib \ - --cmanincdir=/usr/include \ - ) || die "configure problem" - - emake clean - emake -C cman_tool || die "compile problem" - emake -C daemon || die "compile problem" - env -u CFLAGS emake -C qdisk || die "compile problem" - emake -C init.d || die "compile problem" - emake -C man || die "compile problem" -} - -src_install() { - emake DESTDIR="${D}" install || die "install problem" - - # These were installed by cman-lib. - rm "${D}"/usr/lib/libcman.so.${PV} \ - "${D}"/usr/lib/libcman.a \ - "${D}"/usr/include/libcman.h \ - "${D}"/usr/lib/libcman.so.2 \ - "${D}"/usr/lib/libcman.so \ - || die "failed to cleanup extra files" - - newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die - newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die - newinitd "${FILESDIR}"/qdiskd-2.0x.rc qdiskd || die - - keepdir /etc/cluster || die -} - -pkg_postinst() { - einfo "" - einfo "Please add a cluster.conf in /etc/cluster/" - einfo "" - einfo "If you want to use cman and dlm 2.0x.00" - einfo "with 2.6.20 kernels you have to patch your" - einfo "kernel sources with:" - einfo "http://dev.gentoo.org/~xmerlin/gfs/dlm-gfs-2.6.20.patch.bz2" - einfo "" -} diff --git a/sys-cluster/cman/cman-2.03.09.ebuild b/sys-cluster/cman/cman-2.03.09.ebuild new file mode 100644 index 000000000000..4cca0cfa7565 --- /dev/null +++ b/sys-cluster/cman/cman-2.03.09.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.1 2008/11/13 18:56:17 xmerlin Exp $ + +inherit eutils versionator + +CLUSTER_RELEASE="${PV}" +MY_P="cluster-${CLUSTER_RELEASE}" + +MAJ_PV="$(get_major_version)" +MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)" + +DESCRIPTION="general-purpose symmetric cluster manager" +HOMEPAGE="http://sources.redhat.com/cluster/" +SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=sys-kernel/linux-headers-2.6.23 + =sys-cluster/openais-0.80.3* + =sys-cluster/ccs-${CLUSTER_RELEASE}* + =sys-cluster/cman-lib-${CLUSTER_RELEASE}* + !sys-cluster/cman-headers + !sys-cluster/cman-kernel + !sys-cluster/dlm-headers + !sys-cluster/magma + !sys-cluster/magma-plugins + " + +RDEPEND="${DEPEND}" + +PDEPEND="=sys-cluster/dlm-${CLUSTER_RELEASE}* + =sys-cluster/fence-${CLUSTER_RELEASE}*" + +S="${WORKDIR}/${MY_P}/${PN}" + +src_unpack() { + unpack ${A} + cd "${S}" + + # fix the manual pages have executable bit + sed -i -e ' + /\tinstall -d/s/install/& -m 0755/; t + /\tinstall/s/install/& -m 0644/' \ + man/Makefile || die "failed patching man pages permission" + +} + +src_compile() { + (cd "${WORKDIR}"/${MY_P}; + ./configure \ + --cc=$(tc-getCC) \ + --cflags="-Wall" \ + --disable_kernel_check \ + --somajor="$MAJ_PV" \ + --sominor="$MIN_PV" \ + --cmanlibdir=/usr/lib \ + --cmanincdir=/usr/include \ + ) || die "configure problem" + + emake clean + emake -C cman_tool || die "compile problem" + emake -C daemon || die "compile problem" + env -u CFLAGS emake -C qdisk || die "compile problem" + emake -C init.d || die "compile problem" + emake -C man || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install || die "install problem" + + # These were installed by cman-lib. + rm "${D}"/usr/lib/libcman.so.${PV} \ + "${D}"/usr/lib/libcman.a \ + "${D}"/usr/include/libcman.h \ + "${D}"/usr/lib/libcman.so.2 \ + "${D}"/usr/lib/libcman.so \ + || die "failed to cleanup extra files" + + newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die + newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die + newinitd "${FILESDIR}"/qdiskd-2.0x.rc qdiskd || die + + keepdir /etc/cluster || die +} + +pkg_postinst() { + einfo "" + einfo "Please add a cluster.conf in /etc/cluster/" + einfo "" + einfo "If you want to use cman and dlm 2.xx.xx" + einfo "with 2.6.20 kernels you have to patch your" + einfo "kernel sources with:" + einfo "http://dev.gentoo.org/~xmerlin/gfs/dlm-gfs-2.6.20.patch.bz2" + einfo "" +} diff --git a/sys-cluster/cman/files/cman-1.03.00-compile-hack.patch b/sys-cluster/cman/files/cman-1.03.00-compile-hack.patch deleted file mode 100644 index 8cae6ddcc8fc..000000000000 --- a/sys-cluster/cman/files/cman-1.03.00-compile-hack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cluster-1.03.00/cman/qdisk/Makefile.orig 2006-08-30 15:50:39.000000000 +0200 -+++ cluster-1.03.00/cman/qdisk/Makefile 2006-08-30 15:50:48.000000000 +0200 -@@ -17,7 +17,7 @@ - - INCLUDES+=-I. -I../lib - CFLAGS +=-I${incdir} -I${top_srcdir}/config \ -- -Wall -Werror -Wstrict-prototypes -Wshadow -D_GNU_SOURCE -g -+ -Wall -Wstrict-prototypes -Wshadow -D_GNU_SOURCE -g - - TARGET=qdiskd mkqdisk - diff --git a/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch b/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch deleted file mode 100644 index e62dd03bf294..000000000000 --- a/sys-cluster/cman/files/cman-1.03.00-qdisk-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cluster-1.03.00/cman/qdisk/Makefile.orig 2006-07-21 20:01:38.000000000 +0200 -+++ cluster-1.03.00/cman/qdisk/Makefile 2007-03-13 13:42:14.000000000 +0100 -@@ -32,7 +32,7 @@ - - qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \ - gettid.o proc.o ../lib/libcman.a -- gcc -o $@ $^ -lpthread -L../lib -lccs -+ gcc -o $@ $^ -L$(libdir) -lpthread -L../lib -lccs - - mkqdisk: disk.o crc32.o disk_util.o \ - proc.o mkqdisk.o diff --git a/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch b/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch deleted file mode 100644 index fe5dada4a426..000000000000 --- a/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cluster-1.04.00/cman/qdisk/Makefile.orig 2007-05-26 15:23:03.000000000 +0200 -+++ cluster-1.04.00/cman/qdisk/Makefile 2007-05-26 15:23:23.000000000 +0200 -@@ -42,7 +42,7 @@ - - qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \ - gettid.o proc.o daemon_init.o ../lib/libcman.a -- gcc -o $@ $^ -lpthread -L../lib -lccs -+ gcc -o $@ $^ -L$(libdir) -lpthread -L../lib -lccs - - mkqdisk: disk.o crc32.o disk_util.o \ - proc.o mkqdisk.o diff --git a/sys-cluster/cman/files/cman-1.0x.conf b/sys-cluster/cman/files/cman-1.0x.conf deleted file mode 100644 index 6d967ccbb5d1..000000000000 --- a/sys-cluster/cman/files/cman-1.0x.conf +++ /dev/null @@ -1,24 +0,0 @@ -# CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster -# before giving up. If CMAN_CLUSTER_TIMEOUT is positive, then we will -# wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when -# a cluster is not joined. If CMAN_CLUSTER_TIMEOUT is zero, then -# wait indefinately for a cluster join. If CMAN_CLUSTER_TIMEOUT is -# negative, do not check to see that the cluster has been joined -CMAN_CLUSTER_TIMEOUT=120 - -# CMAN_QUORUM_TIMEOUT -- amount of time to wait for a quorate cluster on -# startup quorum is needed by many other applications, so we may as -# well wait here. If CMAN_QUORUM_TIMEOUT is less than 1, quorum will -# be ignored. -CMAN_QUORUM_TIMEOUT=300 - -# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a -# cluster member before calling cman_tool leave during shutdown. -# default is 60 seconds -CMAN_SHUTDOWN_TIMEOUT=60 - -# CMAN_JOIN_OPTIONS -#CMAN_JOIN_OPTS="-c ...." - -# CMAN_LEAVE_OPTIONS -#CMAN_LEAVE_OPTS="" diff --git a/sys-cluster/cman/files/cman-1.0x.rc b/sys-cluster/cman/files/cman-1.0x.rc deleted file mode 100755 index 0b765c217879..000000000000 --- a/sys-cluster/cman/files/cman-1.0x.rc +++ /dev/null @@ -1,171 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/cman-1.0x.rc,v 1.1 2008/03/17 16:47:11 xmerlin Exp $ - -depend() { - use net - need ccs - provide cluster-manager -} - -umount_gfs_filesystems() { - local sig retry - local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)" - - if [ -n "${remaining}" ] - then - sig= - retry=3 - while [ -n "${remaining}" -a "${retry}" -gt 0 ] - do - if [ "${retry}" -lt 3 ] - then - ebegin "Unmounting GFS filesystems (retry)" - umount ${remaining} &>/dev/null - eend $? "Failed to unmount GFS filesystems this retry" - else - ebegin "Unmounting GFS filesystems" - umount ${remaining} &>/dev/null - eend $? "Failed to unmount GFS filesystems" - fi - remaining="$(awk '$3 == "gfs" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)" - [ -z "${remaining}" ] && break - /bin/fuser -k -m ${sig} ${remaining} &>/dev/null - sleep 5 - retry=$((${retry} -1)) - sig=-9 - done - fi -} - - -load_modules() { - local module modules - modules=$1 - - for module in ${modules}; do - ebegin "Loading ${module} kernel module" - modprobe ${module} > /dev/null - eend $? "Failed to load ${module} kernel module" - done -} - -unload_modules() { - local module modules - modules=$1 - - for module in ${modules}; do - ebegin "Unloading ${module} kernel module" - modprobe -r ${module} > /dev/null - eend $? "Failed to unload ${module} kernel module" - done -} - -unload_gfs_modules() { - if [ -f /proc/fs/gfs ]; then - modules="gfs lock_harness" - fi - if [ -d /proc/cluster/lock_dlm ]; then - modules="${modules} lock_dlm" - fi - if [ -d /proc/cluster/lock_gulm ]; then - modules="${modules} lock_gulm" - fi - unload_modules ${modules} -} - - -start() { - #if grep -qE "<[[:space:]]*gulm([[:space:]]|[>]|$)" /etc/cluster/cluster.conf - #then - # die " section detected in /etc/cluster/cluster.conf" - #fi - - if [ ! -d /proc/cluster/config/cman ]; then - load_modules cman - fi - - ebegin "Starting cman" - /sbin/cman_tool -t ${CMAN_CLUSTER_TIMEOUT} \ - -w join ${CMAN_JOIN_OPTS} > /dev/null - - if [ "$?" -ne 0 ] - then - ewend 1 "Failed to start cman" - else - eend 0 - - # make sure that we are quorate? - if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ] - then - ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)" - /sbin/cman_tool -t ${CMAN_QUORUM_TIMEOUT} -q wait - eend $? - fi - fi -} - -stop() { - - # umount GFS filesystems - umount_gfs_filesystems - - # shutdown clvm, fenced services - # need to be fixed (clvm missing) - local fence_status="$(cman_tool services | awk '$1 ~ /Fence/ { print $3 }')" - if [ -n "${fence_status}" ]; then - if [ -x /sbin/fence_tool ]; then - ebegin "Stopping fence domain" - /sbin/fence_tool leave > /dev/null 2>&1 - eend $? - fi - fi - - # shutdown dlm, gfs - unload_gfs_modules - - ebegin "Stopping cman" - local retry stat - local cman_status - cman_status="$(cman_tool status | awk '$1 ~ /Membership/ { print $3 }')" - - if [ "${cman_status}" != "Not-in-Cluster" -a -d /proc/cluster/config/cman ]; then - retry=3 - stat=1 - while [ "${stat}" -eq 1 -a "${retry}" -gt 0 ] - do - /sbin/cman_tool -w -t ${CMAN_SHUTDOWN_TIMEOUT} \ - leave ${CMAN_LEAVE_OPTS} > /dev/null - - stat=$? - retry=$((${retry} -1)) - done - - #if [ "${stat}" -ne 0 ]; then - # /sbin/cman_tool -w -t 2 leave force > /dev/null - #fi - - #if [ "$?" -ne 0 ] - #then - # ewend 1 "Failed to stop cman" - #else - # eend 0 - #fi - else - stat=0 - fi - - eend ${stat} - - if [ "${stat}" -eq 0 ]; then - sleep 1s - - #ebegin "Unloading cman kernel module" - #modprobe -r cman &> /dev/null || return 0 - #eend $? - - unload_modules cman - fi -} - diff --git a/sys-cluster/cman/files/cman-2.02.00-include.patch b/sys-cluster/cman/files/cman-2.02.00-include.patch deleted file mode 100644 index 9dc8de388904..000000000000 --- a/sys-cluster/cman/files/cman-2.02.00-include.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cluster-2.02.00/cman/lib/Makefile.orig 2008-02-26 15:37:43.000000000 +0000 -+++ cluster-2.02.00/cman/lib/Makefile 2008-03-16 15:08:59.000000000 +0000 -@@ -13,6 +13,8 @@ - - TARGET= libcman - -+include ../../make/defines.mk -+ - LIBDIRT=$(TARGET).a \ - $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) - -@@ -21,8 +23,6 @@ - - INCDIRT=$(TARGET).h - --include ../../make/defines.mk -- - SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} - STATICLIB=$(TARGET).a - diff --git a/sys-cluster/cman/files/qdiskd-1.0x.rc b/sys-cluster/cman/files/qdiskd-1.0x.rc deleted file mode 100755 index ed3e24c4cf35..000000000000 --- a/sys-cluster/cman/files/qdiskd-1.0x.rc +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/qdiskd-1.0x.rc,v 1.1 2008/03/17 16:47:11 xmerlin Exp $ - -depend() { - use net - need cluster-manager -} - -start() { - ebegin "Starting the Quorum Disk Daemon" - start-stop-daemon --start --quiet --exec /sbin/qdiskd -- -Q - eend $? "Failed to start qdiskd" -} - -stop() { - ebegin "Stopping the Quorum Disk Daemon" - - start-stop-daemon --stop --pidfile /var/run/qdiskd.pid - eend $? "Failed to stop qdiskd" -} - -- cgit v1.2.3-65-gdbad