* [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/rgmanager/, sys-cluster/rgmanager/files/
@ 2011-07-27 11:19 Tiziano Müller
0 siblings, 0 replies; only message in thread
From: Tiziano Müller @ 2011-07-27 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 54b4b6d18f306219088dcaed5c93fa3da88c4bc7
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 10:13:19 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 10:13:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=54b4b6d1
Version bump and cleanup (EAPI=4 usage, HOMEPAGE, default phase usage). Init-script rework
---
sys-cluster/rgmanager/Manifest | 10 +-
sys-cluster/rgmanager/files/rgmanager-2.0x.rc | 110 --------------------
...ml2.patch => rgmanager-3.1.5-fix_libxml2.patch} | 0
.../files/{rgmanager-2.0x.conf => rgmanager.confd} | 3 +
sys-cluster/rgmanager/files/rgmanager.initd | 35 ++++++
...manager-3.1.1.ebuild => rgmanager-3.1.5.ebuild} | 49 +++++----
6 files changed, 69 insertions(+), 138 deletions(-)
diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
index e42bc18..b741000 100644
--- a/sys-cluster/rgmanager/Manifest
+++ b/sys-cluster/rgmanager/Manifest
@@ -1,5 +1,5 @@
-AUX rgmanager-2.0x.conf 245 RMD160 d13382433c60ebf4a23884a745c84735b7c1ee46 SHA1 33c833f4479b73fc47ff62f742f9aed86d126aee SHA256 1b97548dac4f78fc1689298835373c224730c2f5020c3ce0996402ec950f5ece
-AUX rgmanager-2.0x.rc 1991 RMD160 e770fd8805afee61e13f5fb8851b77c22258b1cc SHA1 79a5c9c6d26df07c2f085b61782cbcc10f965c89 SHA256 2cd70711935077ad1020de0f8072cc4add1470ce8052ee493e2a2da4b465e542
-AUX rgmanager-3.1.1-fix_libxml2.patch 731 RMD160 ba4eb0c6301abe1f408840fbfb14b45c337d3cbf SHA1 a7d56a71e72c7e0d433e84571701d5a374eb1bbe SHA256 b939dec463869b3b3c21b4a9dfad61f14eee57e0cd006e661387c408a0537ced
-DIST cluster-3.1.1.tar.gz 649198 RMD160 620b292d21f48a29f0a66d28354e373b8ae4cae6 SHA1 ecf3bacd90f623ff0462f08ed17357152c1b723b SHA256 0d8de2fc7933e427ce9eb03f53199d0b7bf3a1af967dfa45fa3f9cb62c7472a5
-EBUILD rgmanager-3.1.1.ebuild 1583 RMD160 611020b1e4cc535893cdda6d04aa4c671cbf5a8c SHA1 adb6d5275c631c329b30fb1b1e1566d135999ac7 SHA256 e163e28fd3c7d133d647339abfdd7e87701a8ac0965a1b726464e5773735b4ec
+AUX rgmanager-3.1.5-fix_libxml2.patch 731 RMD160 ba4eb0c6301abe1f408840fbfb14b45c337d3cbf SHA1 a7d56a71e72c7e0d433e84571701d5a374eb1bbe SHA256 b939dec463869b3b3c21b4a9dfad61f14eee57e0cd006e661387c408a0537ced
+AUX rgmanager.confd 280 RMD160 665f41ebef32eff3471795e706e479ecb87cace5 SHA1 18b7fe51b960e3a799764dc13da70d6cca39316b SHA256 6b76b80ebd41c3dd375e3e58f518f312af57746b906a41ad2f317eee17c67993
+AUX rgmanager.initd 754 RMD160 2a1e1fba0f376fe5f5ee31af80c106a950a1873e SHA1 c8d8a3c9f833ae56757b7837d670642bb17cd815 SHA256 856e388db67c525514c10eb6fa02283a7ac755cdfc609a9c613f978fc8faf634
+EBUILD rgmanager-3.1.5.ebuild 1552 RMD160 c5e2fb28e8ec2906c8ea7a75d17bb34c70819351 SHA1 298e65c9bf5dc17c2ebed7eb378aebf562fc8bbe SHA256 6218628b0aae9a179d0bcc3b3049928d3959c77ed763d2e07a5cb63e1b7f9c6c
+DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e
diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc b/sys-cluster/rgmanager/files/rgmanager-2.0x.rc
deleted file mode 100755
index 64156f5..0000000
--- a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Adaption of the original RedHat script
-# Original Copyright (C) 2003 Red Hat, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager-2.0x.rc,v 1.1 2008/03/17 17:14:00 xmerlin Exp $
-
-depend() {
- use net
- need cman
-}
-
-# We'd like a reload method as well
-opts="${opts} reload"
-
-ID="Cluster Resource Manager"
-RGMGRD=$(which clurgmgrd)
-RMTABD=$(which clurmtabd)
-CFG_FILE="/etc/cluster/cluster.conf"
-
-LOG_ERR=3
-LOG_WARNING=4
-LOG_NOTICE=5
-LOG_INFO=6
-
-#
-# If we're not configured, then don't start anything.
-#
-[ -f "$CFG_FILE" ] || exit 0
-
-
-#
-# log_and_print <level> <message>
-#
-function log_and_print()
-{
- if [ -z "$1" -o -z "$2" ]; then
- return 1;
- fi
-
- clulog -p $$ -n "rgmanager" -s $1 "$2"
- echo $2
-
- return 0;
-}
-
-
-#
-# Bring down the cluster on a node.
-#
-function stop_cluster()
-{
- kill -TERM $(pidof $RGMGRD)
-
- while [ 0 ]; do
- if [ -n "`pidof $RGMGRD`" ]; then
- while [ -n "`pidof $RGMGRD`" ]; do
- sleep 1
- done
- einfo "Waiting for $(basename ${RGMGRD})"
- else
- eend "Services are stopped."
- fi
-
- # Ensure all NFS rmtab daemons are dead.
- killall $(basename ${RMTABD}) &> /dev/null
-
- rm -f /var/run/$(basename ${RGMGRD}).pid
-
- return 0
- done
-}
-
-
-
-function start() {
- ebegin "Starting cluster resource manager"
- start-stop-daemon --start --quiet --exec ${RGMGRD} ${RGMGR_OPTS}
- ret=$?
- if [ $ret -eq 0 ]; then
- touch /var/lock/subsys/rgmanager
- fi
- eend $ret
-}
-
-function restart() {
- pidof ${RGMGRD} &> /dev/null
- if [ ${?} -ne 1 ]; then
- svc_stop
- fi
- svc_start
-}
-
-function reload() {
- clulog -p ${LOG_NOTICE} "Reloading Resource Configuration."
- ebegin "Reloading Resource Configuration "
- kill -s HUP $(pidof ${RGMGRD} )
- rv=${?}
- eend
- exit ${rv}
-}
-
-function stop() {
- ebegin "Shutting down cluster resource manager"
- if [ -n "$(pidof ${RGMGRD})" ]; then
- stop_cluster
- fi
- rm -f /var/lock/subsys/rgmanager
- eend
-}
diff --git a/sys-cluster/rgmanager/files/rgmanager-3.1.1-fix_libxml2.patch b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
similarity index 100%
rename from sys-cluster/rgmanager/files/rgmanager-3.1.1-fix_libxml2.patch
rename to sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf b/sys-cluster/rgmanager/files/rgmanager.confd
similarity index 87%
rename from sys-cluster/rgmanager/files/rgmanager-2.0x.conf
rename to sys-cluster/rgmanager/files/rgmanager.confd
index dd32281..c66ffd0 100644
--- a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf
+++ b/sys-cluster/rgmanager/files/rgmanager.confd
@@ -2,4 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager-2.0x.conf,v 1.1 2008/03/17 17:14:00 xmerlin Exp $
+PIDFILE="/var/run/rgmanager.pid"
+
RGMGR_OPTS=""
+
diff --git a/sys-cluster/rgmanager/files/rgmanager.initd b/sys-cluster/rgmanager/files/rgmanager.initd
new file mode 100755
index 0000000..1ce539d
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Adaption of the original RedHat script
+# Original Copyright (C) 2003 Red Hat, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager-2.0x.rc,v 1.1 2008/03/17 17:14:00 xmerlin Exp $
+
+depend() {
+ use net
+# need cman
+}
+
+start() {
+ ebegin "Starting cluster resource manager"
+
+ # recreate run-directory
+ mkdir -p /var/run/cluster
+
+ start-stop-daemon \
+ --start \
+ --quiet \
+ --exec "/usr/sbin/rgmanager" \
+ --pidfile "${PIDFILE}" \
+ -- ${RGMGR_OPTS}
+ eend $ret
+}
+
+stop() {
+ ebegin "Shutting down cluster resource manager"
+ start-stop-daemon \
+ --stop \
+ --pidfile "${PIDFILE}" \
+ --retry 0
+ eend $?
+}
diff --git a/sys-cluster/rgmanager/rgmanager-3.1.1.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
similarity index 54%
rename from sys-cluster/rgmanager/rgmanager-3.1.1.ebuild
rename to sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
index 9150848..5145fab 100644
--- a/sys-cluster/rgmanager/rgmanager-3.1.1.ebuild
+++ b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild,v 1.1 2011/01/20 09:13:18 xarthisius Exp $
-EAPI=3
+EAPI=4
inherit eutils multilib versionator
@@ -10,10 +10,10 @@ 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)"
+MIN_PV="$(get_version_component_range 2-3)"
DESCRIPTION="Clustered resource group manager"
-HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
+HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
LICENSE="GPL-2"
@@ -21,13 +21,16 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="dbus"
-RDEPEND="
+CDEPEND="
~sys-cluster/libcman-${PV}
~sys-cluster/liblogthread-${PV}
~sys-cluster/libccs-${PV}
- ~sys-cluster/libdlm-${PV}"
-DEPEND="${RDEPEND}
+ ~sys-cluster/libdlm-${PV}
dev-libs/libxml2
+ dbus? ( sys-apps/dbus )"
+RDEPEND="${CDEPEND}
+ ~sys-cluster/cman-${PV}"
+DEPEND="${CDEPEND}
=sys-libs/slang-2*"
S=${WORKDIR}/${MY_P}/${PN}
@@ -39,25 +42,25 @@ src_prepare() {
src_configure() {
local myopts=""
use dbus || myopts="--disable_dbus"
- (cd "${WORKDIR}"/${MY_P};
- ./configure \
- --cc="$(tc-getCC)" \
- --cflags="-Wall" \
- --libdir=/usr/$(get_libdir) \
- --disable_kernel_check \
- --somajor="$MAJ_PV" \
- --sominor="$MIN_PV" \
- --dlmlibdir=/usr/$(get_libdir) \
- --dlmincdir=/usr/include \
- --cmanlibdir=/usr/$(get_libdir) \
- --cmanincdir=/usr/include \
- ${myopts} \
- ) || die "configure problem"
+ cd "${WORKDIR}"/${MY_P}
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --cflags="-Wall" \
+ --libdir=/usr/$(get_libdir) \
+ --disable_kernel_check \
+ --somajor="$MAJ_PV" \
+ --sominor="$MIN_PV" \
+ --dlmlibdir=/usr/$(get_libdir) \
+ --dlmincdir=/usr/include \
+ --cmanlibdir=/usr/$(get_libdir) \
+ --cmanincdir=/usr/include \
+ ${myopts} \
+ || die "configure problem"
}
src_install() {
- emake DESTDIR="${D}" install || die "emake failed"
+ default
- newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
- newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-27 11:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-27 11:19 [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/rgmanager/, sys-cluster/rgmanager/files/ Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox