* [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/
@ 2011-02-22 12:53 Alexys Jacob
0 siblings, 0 replies; 3+ messages in thread
From: Alexys Jacob @ 2011-02-22 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 6d6e70fb12f5d34adaa52e7a801fe817a04c8e29
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 12:53:30 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 12:53:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=6d6e70fb
pacemaker with cman
---
sys-cluster/pacemaker/Manifest | 5 +
.../files/pacemaker-1.1.4-autotools-r2.patch | 287 ++++++++++++++++++++
sys-cluster/pacemaker/files/pacemaker.initd | 39 +++
sys-cluster/pacemaker/files/pacemaker.service | 5 +
sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild | 84 ++++++
5 files changed, 420 insertions(+), 0 deletions(-)
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
new file mode 100644
index 0000000..425b03a
--- /dev/null
+++ b/sys-cluster/pacemaker/Manifest
@@ -0,0 +1,5 @@
+AUX pacemaker-1.1.4-autotools-r2.patch 9932 RMD160 6240324b9188ab5beb5ec2ec775c66a94cc3c7be SHA1 5cb30350c92cd5019f892c2c37d7cb53190c3b79 SHA256 62d937c6a7894a686a79530f6daa2a5f814fecd6ea29dc700308e89d668e488d
+AUX pacemaker.initd 922 RMD160 1ee204b244f3e40a6fb272f43d0cf11d7e4404d0 SHA1 7ffa0222674d5003d550b51bad7f0735366ffe01 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af
+AUX pacemaker.service 105 RMD160 e743788acefa97f879ea67b5b3bbbff715c71bce SHA1 42739d9a111a25a643d8f5f8b9fdd2cf1267853a SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c
+DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b728679 SHA1 382a4cbd80ef8f1c303f1c5c02d60390e808397f SHA256 922e2929cf9f2efa2e2d9b3185a7ac826a96e86cd8d9f4c4eae177f88f1f03b1
+EBUILD pacemaker-1.1.4-r5.ebuild 2180 RMD160 1fb5e97611b43e6ba84026f1cb031a6f0b379323 SHA1 c7722c8f1a520cffc504864b4bcff408962c7ac2 SHA256 082f88c67e4679de37ae62c465d30fc2875807f3a91c987fe7e2fb9a0c95d857
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
new file mode 100644
index 0000000..a3aad64
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
@@ -0,0 +1,287 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1354,6 +1354,7 @@
+ if
+ $PKGCONFIG --exists $SERVICELOG
+ then
++ PKG_CHECK_MODULES([SERVICELOG], [servicelog-1])
+ SERVICELOG_EXISTS="yes"
+ fi
+ AC_MSG_RESULT($SERVICELOG_EXISTS)
+@@ -1366,6 +1367,7 @@
+ if
+ $PKGCONFIG --exists $OPENIPMI $SERVICELOG
+ then
++ PKG_CHECK_MODULES([OPENIPMI_SERVICELOG],[OpenIPMI OpenIPMIposix])
+ OPENIPMI_SERVICELOG_EXISTS="yes"
+ fi
+ AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
+--- a/fencing/Makefile.am
++++ b/fencing/Makefile.am
+@@ -36,21 +36,20 @@
+
+ stonith_test_SOURCES = test.c
+
+-stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la \
++stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
+
+ stonith_admin_SOURCES = admin.c
+
+-stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la \
++stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
+-
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
+ stonithd_SOURCES = main.c commands.c remote.c
+
+-stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la \
++stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
+--- a/mcp/Makefile.am
++++ b/mcp/Makefile.am
+@@ -34,7 +34,7 @@
+ noinst_HEADERS =
+
+ pacemakerd_SOURCES = pacemaker.c corosync.c
+-pacemakerd_LDADD = $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -lcfg -lconfdb
++pacemakerd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) -lcfg -lconfdb
+
+ %.8: %
+ echo Creating $@
+--- a/crmd/Makefile.am
++++ b/crmd/Makefile.am
+@@ -41,14 +41,13 @@
+ cib.c pengine.c tengine.c lrm.c \
+ utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
+
+-crmd_LDADD = $(CLUSTERLIBS) -llrm \
+- $(top_builddir)/lib/fencing/libstonithd.la \
++crmd_LDADD = $(top_builddir)/lib/fencing/libstonithd.la \
+ $(top_builddir)/lib/transition/libtransitioner.la \
+ $(top_builddir)/lib/pengine/libpe_rules.la \
+ $(top_builddir)/lib/cib/libcib.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/common/libcrmcommon.la
+-
++ $(top_builddir)/lib/common/libcrmcommon.la \
++ $(CLUSTERLIBS) -llrm
+ if BUILD_XML_HELP
+ man8_MANS = crmd.8
+
+--- a/pengine/Makefile.am
++++ b/pengine/Makefile.am
+@@ -73,14 +73,14 @@
+ libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la
+
+ pengine_SOURCES = main.c
+-pengine_LDADD = $(COMMONLIBS) $(top_builddir)/lib/cib/libcib.la
++pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
+ # libcib for get_object_root()
+ # $(top_builddir)/lib/hbclient/libhbclient.la
+
+ ptest_SOURCES = ptest.c
+-ptest_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/lib/cib/libcib.la \
+- $(top_builddir)/lib/transition/libtransitioner.la
++ptest_LDADD = $(top_builddir)/lib/cib/libcib.la \
++ $(top_builddir)/lib/transition/libtransitioner.la \
++ $(COMMONLIBS)
+
+ install-exec-local:
+ $(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
+--- a/lib/common/Makefile.am
++++ b/lib/common/Makefile.am
+@@ -38,7 +38,7 @@
+ endif
+
+ libcrmcluster_la_LDFLAGS = -version-info 1:0:0
+-libcrmcluster_la_LIBADD = $(CLUSTERLIBS) libcrmcommon.la
++libcrmcluster_la_LIBADD = libcrmcommon.la $(CLUSTERLIBS)
+ libcrmcluster_la_DEPENDENCIES = libcrmcommon.la
+
+ # Can't use -Wcast-qual here because glib insists on pretending things are const
+@@ -51,7 +51,8 @@
+
+ libcrmcommon_la_SOURCES = ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c
+
+-libcrmcommon_la_LDFLAGS = -version-info 2:0:0 $(GNUTLSLIBS)
++libcrmcommon_la_LDFLAGS = -version-info 2:0:0
++libcrmcommon_la_LIBADD = $(GNUTLSLIBS)
+
+ clean-generic:
+ rm -f *.log *.debug *.xml *~
+--- a/lib/plugins/lrm/Makefile.am
++++ b/lib/plugins/lrm/Makefile.am
+@@ -29,8 +29,8 @@
+ plugin_LTLIBRARIES = stonith.la
+
+ stonith_la_SOURCES = raexecstonith.c
+-stonith_la_LDFLAGS = -lpils -export-dynamic -module -avoid-version \
+- $(top_builddir)/lib/fencing/libstonithd.la -llrm
++stonith_la_LDFLAGS = -export-dynamic -module -avoid-version
++stonith_la_LIBADD = $(top_builddir)/lib/fencing/libstonithd.la -lpils -llrm
+
+ install-exec-local:
+ $(mkinstalldirs) $(DESTDIR)$(lrmdir)
+--- a/lib/fencing/Makefile.am
++++ b/lib/fencing/Makefile.am
+@@ -25,8 +25,8 @@
+ lib_LTLIBRARIES = libstonithd.la
+
+ libstonithd_la_SOURCES = st_client.c
+-libstonithd_la_LDFLAGS = -version-info 1:0:0 \
+- -lplumb -lstonith $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la
++libstonithd_la_LDFLAGS = -version-info 1:0:0
++libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la \
++ -lplumb -lstonith $(CLUSTERLIBS)
+
+ AM_CFLAGS = $(INCLUDES)
+--- a/cib/Makefile.am
++++ b/cib/Makefile.am
+@@ -47,8 +47,8 @@
+ cib_SOURCES = io.c messages.c notify.c \
+ callbacks.c main.c remote.c common.c
+
+-cib_LDADD = $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcluster.la
++cib_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \
++ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
+
+ cibmon_SOURCES = cibmon.c
+ cibmon_LDADD = $(COMMONLIBS)
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -62,8 +62,8 @@
+ noinst_HEADERS =
+
+ crmadmin_SOURCES = crmadmin.c
+-crmadmin_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/pengine/libpe_status.la
++crmadmin_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
++ $(COMMONLIBS) $(CLUSTERLIBS)
+
+ crm_uuid_SOURCES = crm_uuid.c
+ crm_uuid_LDADD = $(top_builddir)/lib/common/libcrmcluster.la
+@@ -75,45 +75,45 @@
+ crm_shadow_LDADD = $(COMMONLIBS)
+
+ crm_node_SOURCES = ccm_epoche.c
+-crm_node_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcluster.la
++crm_node_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \
++ $(COMMONLIBS) $(CLUSTERLIBS)
+
+ crm_simulate_SOURCES = crm_inject.c
+ crm_simulate_CFLAGS = -I$(top_srcdir)/pengine
+
+-crm_simulate_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/lib/pengine/libpe_status.la \
++crm_simulate_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
+ $(top_builddir)/pengine/libpengine.la \
+ $(top_builddir)/lib/cib/libcib.la \
+- $(top_builddir)/lib/transition/libtransitioner.la
++ $(top_builddir)/lib/transition/libtransitioner.la \
++ $(COMMONLIBS)
+
+ crm_diff_SOURCES = xml_diff.c
+ crm_diff_LDADD = $(COMMONLIBS)
+
+ crm_mon_SOURCES = crm_mon.c
+-crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
+- $(top_builddir)/lib/pengine/libpe_status.la
++crm_mon_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
++ $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm
+
+ # Arguments could be made that this should live in crm/pengine
+ crm_verify_SOURCES = crm_verify.c
+-crm_verify_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/lib/pengine/libpe_status.la \
+- $(top_builddir)/pengine/libpengine.la
++crm_verify_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
++ $(top_builddir)/pengine/libpengine.la \
++ $(COMMONLIBS)
+
+ crm_attribute_SOURCES = crm_attribute.c
+ crm_attribute_LDADD = $(COMMONLIBS)
+
+ crm_resource_SOURCES = crm_resource.c
+-crm_resource_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/lib/pengine/libpe_rules.la \
++crm_resource_LDADD = $(top_builddir)/lib/pengine/libpe_rules.la \
+ $(top_builddir)/lib/pengine/libpe_status.la \
+- $(top_builddir)/pengine/libpengine.la
++ $(top_builddir)/pengine/libpengine.la \
++ $(COMMONLIBS)
+
+ iso8601_SOURCES = test.iso8601.c
+ iso8601_LDADD = $(COMMONLIBS)
+
+ attrd_SOURCES = attrd.c
+-attrd_LDADD = $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la
++attrd_LDADD = $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS)
+
+ #pingd_SOURCES = pingd.c
+ #pingd_LDADD = $(COMMONLIBS)
+@@ -123,14 +123,14 @@
+
+ if BUILD_SERVICELOG
+ notifyServicelogEvent_SOURCES = notifyServicelogEvent.c
+-notifyServicelogEvent_CFLAGS = `pkg-config --cflags servicelog-1`
+-notifyServicelogEvent_LDFLAGS = `pkg-config --libs servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
++notifyServicelogEvent_CFLAGS = $(SERVICELOG_CFLAGS)
++notifyServicelogEvent_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS)
+ endif
+
+ if BUILD_OPENIPMI_SERVICELOG
+ ipmiservicelogd_SOURCES = ipmiservicelogd.c
+-ipmiservicelogd_CFLAGS = `pkg-config --cflags OpenIPMI OpenIPMIposix servicelog-1`
+-ipmiservicelogd_LDFLAGS = `pkg-config --libs OpenIPMI OpenIPMIposix servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
++ipmiservicelogd_CFLAGS = $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS)
++ipmiservicelogd_LDFLAGS = $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
+ endif
+
+ %.8: % crm_attribute
+--- a/extra/Makefile.am
++++ b/extra/Makefile.am
+@@ -20,5 +20,5 @@
+
+ SUBDIRS = resources
+
+-mibdir = $(datadir)/snmp/mibs
++mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
+ mib_DATA = PCMK-MIB.txt
+--- a/lib/pengine/Makefile.am
++++ b/lib/pengine/Makefile.am
+@@ -34,7 +34,7 @@
+
+ libpe_status_la_LDFLAGS = -version-info 3:0:0
+ libpe_status_la_SOURCES = $(rule_files) $(status_files)
+-libpe_status_la_LIBADD = -llrm @CURSESLIBS@
++libpe_status_la_LIBADD = $(top_builddir)/lib/cib/libcib.la -llrm @CURSESLIBS@
+
+ clean-generic:
+ rm -f *.log *.debug *~
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -18,7 +18,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+
+ ## Subdirectories...
+-SUBDIRS = common pengine transition cib fencing plugins
++SUBDIRS = common cib pengine transition fencing plugins
+ DIST_SUBDIRS = $(SUBDIRS) ais
+
+ if BUILD_CS_SUPPORT
diff --git a/sys-cluster/pacemaker/files/pacemaker.initd b/sys-cluster/pacemaker/files/pacemaker.initd
new file mode 100644
index 0000000..4231425
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker.initd
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.initd,v 1.1 2011/02/21 14:39:28 ultrabug Exp $
+
+PIDFILE=/var/run/pacemaker.pid
+
+depend() {
+ need net corosync
+ use syslog
+}
+
+start() {
+ nc=0
+ ebegin "Starting Pacemaker Cluster Manager"
+ einfon "Waiting for Corosync startup ."
+ while true; do
+ /usr/sbin/corosync-cfgtool -s &>/dev/null && break
+ nc=$(expr $nc + 1)
+ if [ $nc -gt 30 ]; then
+ echo
+ eend 1 "Failed to detect Corosync startup, is it really running ?"
+ exit 1
+ fi
+ sleep 1
+ echo -n "."
+ done
+ echo
+ start-stop-daemon --start -q --exec /usr/sbin/pacemakerd \
+ --pidfile "${PIDFILE}" --make-pidfile --background \
+ -- -f
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Pacemaker Cluster Manager"
+ start-stop-daemon --stop -q --pidfile "${PIDFILE}"
+ eend $?
+}
diff --git a/sys-cluster/pacemaker/files/pacemaker.service b/sys-cluster/pacemaker/files/pacemaker.service
new file mode 100644
index 0000000..6383499
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker.service
@@ -0,0 +1,5 @@
+service {
+ # Load the Pacemaker Cluster Resource Manager
+ name: pacemaker
+ ver: 1
+}
\ No newline at end of file
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild
new file mode 100644
index 0000000..a4fd9a5
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild,v 1.1 2011/02/21 14:39:27 ultrabug Exp $
+
+EAPI="2"
+
+MY_PN="Pacemaker"
+MY_P="${MY_PN}-${PV}"
+PYTHON_DEPEND="2"
+inherit autotools base eutils flag-o-matic multilib python
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
+SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="heartbeat smtp snmp static-libs cman3"
+
+RDEPEND="
+ dev-libs/libxslt
+ sys-cluster/corosync
+ sys-cluster/cluster-glue
+ sys-cluster/resource-agents
+ heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+ smtp? ( net-libs/libesmtp )
+ snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-autotools-r2.patch"
+)
+
+S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ base_src_prepare
+ sed -i -e "/ggdb3/d" configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local myopts=""
+ use heartbeat || myopts="--with-ais"
+ # appends lib to localstatedir automatically
+ econf \
+ --localstatedir=/var \
+ --disable-dependency-tracking \
+ --disable-fatal-warnings \
+ $(use_with cman3 cs-quorum) \
+ $(use_with cman3 cman) \
+ $(use_with smtp esmtp) \
+ $(use_with heartbeat) \
+ $(use_with snmp) \
+ $(use_enable static-libs static) \
+ ${myopts}
+}
+
+src_install() {
+ base_src_install
+ newinitd "${FILESDIR}/pacemaker.initd" pacemaker || die
+ insinto /etc/corosync/service.d
+ newins "${FILESDIR}/pacemaker.service" pacemaker || die
+}
+
+pkg_postinst() {
+ elog "This version of Pacemaker uses the new MCP feature"
+ elog "and the v1 plugin for CoroSync. Read [1] for more info."
+ elog
+ elog "To start the Pacemaker Cluster Manager, run:"
+ elog "/etc/init.d/pacemaker start"
+ elog
+ elog "[1] http://theclusterguy.clusterlabs.org/post/907043024/introducing-the-pacemaker-master-control-process-for"
+ elog
+ elog "Note: sys-cluster/openais is no longer a hard dependency of ${P},"
+ elog "so you may need to install it yourself to suit your needs."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/
@ 2011-02-25 10:49 Alexys Jacob
0 siblings, 0 replies; 3+ messages in thread
From: Alexys Jacob @ 2011-02-25 10:49 UTC (permalink / raw
To: gentoo-commits
commit: 952e1fa2d7ddad9525184eca3cb27a72e0c4fd52
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 10:48:48 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 10:48:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=952e1fa2
pacemaker bump
---
sys-cluster/pacemaker/Manifest | 6 +-
...ls-r2.patch => pacemaker-1.1.5-autotools.patch} | 68 ++++++++++----------
...aker-1.1.4-r5.ebuild => pacemaker-1.1.5.ebuild} | 7 +-
3 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 425b03a..58e324b 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,5 +1,5 @@
-AUX pacemaker-1.1.4-autotools-r2.patch 9932 RMD160 6240324b9188ab5beb5ec2ec775c66a94cc3c7be SHA1 5cb30350c92cd5019f892c2c37d7cb53190c3b79 SHA256 62d937c6a7894a686a79530f6daa2a5f814fecd6ea29dc700308e89d668e488d
+AUX pacemaker-1.1.5-autotools.patch 10094 RMD160 fc2c40684eee70a2d6899c2bae1518a3f3e7a49f SHA1 07f7939ba553d232f75c16c9bb5f705fbe0d2271 SHA256 680849bdb47b4107bd10a055b6b293ae6642ce44c00c832a8dc30b330d72beaa
AUX pacemaker.initd 922 RMD160 1ee204b244f3e40a6fb272f43d0cf11d7e4404d0 SHA1 7ffa0222674d5003d550b51bad7f0735366ffe01 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af
AUX pacemaker.service 105 RMD160 e743788acefa97f879ea67b5b3bbbff715c71bce SHA1 42739d9a111a25a643d8f5f8b9fdd2cf1267853a SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c
-DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b728679 SHA1 382a4cbd80ef8f1c303f1c5c02d60390e808397f SHA256 922e2929cf9f2efa2e2d9b3185a7ac826a96e86cd8d9f4c4eae177f88f1f03b1
-EBUILD pacemaker-1.1.4-r5.ebuild 2180 RMD160 1fb5e97611b43e6ba84026f1cb031a6f0b379323 SHA1 c7722c8f1a520cffc504864b4bcff408962c7ac2 SHA256 082f88c67e4679de37ae62c465d30fc2875807f3a91c987fe7e2fb9a0c95d857
+DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2
+EBUILD pacemaker-1.1.5.ebuild 2210 RMD160 2320bbab2916c77935900868d88df7dd461dd206 SHA1 23d0269330f9514af260e384e78eaa87ab362891 SHA256 f1a0315cc61e50f144c078dade036f9724c60006d4a3be82cda9c96353cc483e
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
similarity index 97%
rename from sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
rename to sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
index a3aad64..5cd4f57 100644
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
@@ -16,39 +16,6 @@
OPENIPMI_SERVICELOG_EXISTS="yes"
fi
AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
---- a/fencing/Makefile.am
-+++ b/fencing/Makefile.am
-@@ -36,21 +36,20 @@
-
- stonith_test_SOURCES = test.c
-
--stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
-
- stonith_admin_SOURCES = admin.c
-
--stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
--
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
- stonithd_SOURCES = main.c commands.c remote.c
-
--stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
--- a/mcp/Makefile.am
+++ b/mcp/Makefile.am
@@ -34,7 +34,7 @@
@@ -285,3 +252,38 @@
DIST_SUBDIRS = $(SUBDIRS) ais
if BUILD_CS_SUPPORT
+--- a/fencing/Makefile.am 2011-02-25 09:58:45.621572915 +0100
++++ b/fencing/Makefile.am 2011-02-25 10:00:39.024820006 +0100
+@@ -42,23 +42,23 @@
+
+ stonith_test_SOURCES = test.c
+
+-stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la \
++stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
+
+ stonith_admin_SOURCES = admin.c
+
+-stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
++stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/cib/libcib.la \
+ $(top_builddir)/lib/pengine/libpe_status.la \
+- $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
+
+ stonithd_SOURCES = main.c commands.c remote.c
+
+-stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la \
++stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
similarity index 94%
rename from sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild
rename to sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
index a4fd9a5..94665ce 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="heartbeat smtp snmp static-libs cman3"
+IUSE="acl cman3 heartbeat smtp snmp static-libs"
RDEPEND="
dev-libs/libxslt
@@ -30,7 +30,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-autotools-r2.patch"
+# "${FILESDIR}/${PN}-1.1.5-autotools.patch"
)
S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
@@ -54,10 +54,11 @@ src_configure() {
--localstatedir=/var \
--disable-dependency-tracking \
--disable-fatal-warnings \
+ $(use_with acl) \
$(use_with cman3 cs-quorum) \
$(use_with cman3 cman) \
- $(use_with smtp esmtp) \
$(use_with heartbeat) \
+ $(use_with smtp esmtp) \
$(use_with snmp) \
$(use_enable static-libs static) \
${myopts}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/
@ 2011-09-15 14:59 Alexys Jacob
0 siblings, 0 replies; 3+ messages in thread
From: Alexys Jacob @ 2011-09-15 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 460b4f191425447203a821a8c7cf8f27b7f8e8de
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 14:59:25 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 14:59:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=460b4f19
drop useless sys-cluster
---
sys-cluster/pacemaker/Manifest | 5 -
.../files/pacemaker-1.1.5-autotools.patch | 271 --------------------
sys-cluster/pacemaker/files/pacemaker.initd | 39 ---
sys-cluster/pacemaker/files/pacemaker.service | 5 -
sys-cluster/pacemaker/pacemaker-1.1.5-r1.ebuild | 87 -------
5 files changed, 0 insertions(+), 407 deletions(-)
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
deleted file mode 100644
index 58b4d40..0000000
--- a/sys-cluster/pacemaker/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pacemaker-1.1.5-autotools.patch 9673 RMD160 f2f6aa1ee801ebe8fa55da22f6644c63e450ce8e SHA1 e2534eb274c4f24b1d6dc0518c3811e90f19385e SHA256 5aa8b3ff97e63d380e3913f838e0ec7bbe477bd09c74668bc15a3456c65f9fe3
-AUX pacemaker.initd 922 RMD160 1ee204b244f3e40a6fb272f43d0cf11d7e4404d0 SHA1 7ffa0222674d5003d550b51bad7f0735366ffe01 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af
-AUX pacemaker.service 105 RMD160 e743788acefa97f879ea67b5b3bbbff715c71bce SHA1 42739d9a111a25a643d8f5f8b9fdd2cf1267853a SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c
-DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2
-EBUILD pacemaker-1.1.5-r1.ebuild 2174 RMD160 42d412ac1dcd551ac07dc0a7baefad2f57034637 SHA1 49c8bdebad89fcc91908262f3aa82f33878303b0 SHA256 cc4da803573ec278514ab2a3f03c885dce6da8698d33cd81d08a6b72ee80478f
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
deleted file mode 100644
index b4098ee..0000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
+++ /dev/null
@@ -1,271 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1354,6 +1354,7 @@
- if
- $PKGCONFIG --exists $SERVICELOG
- then
-+ PKG_CHECK_MODULES([SERVICELOG], [servicelog-1])
- SERVICELOG_EXISTS="yes"
- fi
- AC_MSG_RESULT($SERVICELOG_EXISTS)
-@@ -1366,6 +1367,7 @@
- if
- $PKGCONFIG --exists $OPENIPMI $SERVICELOG
- then
-+ PKG_CHECK_MODULES([OPENIPMI_SERVICELOG],[OpenIPMI OpenIPMIposix])
- OPENIPMI_SERVICELOG_EXISTS="yes"
- fi
- AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
---- a/mcp/Makefile.am
-+++ b/mcp/Makefile.am
-@@ -34,7 +34,7 @@
- noinst_HEADERS =
-
- pacemakerd_SOURCES = pacemaker.c corosync.c
--pacemakerd_LDADD = $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -lcfg -lconfdb
-+pacemakerd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) -lcfg -lconfdb
-
- %.8: %
- echo Creating $@
---- a/crmd/Makefile.am
-+++ b/crmd/Makefile.am
-@@ -41,14 +41,13 @@
- cib.c pengine.c tengine.c lrm.c \
- utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
-
--crmd_LDADD = $(CLUSTERLIBS) -llrm \
-- $(top_builddir)/lib/fencing/libstonithd.la \
-+crmd_LDADD = $(top_builddir)/lib/fencing/libstonithd.la \
- $(top_builddir)/lib/transition/libtransitioner.la \
- $(top_builddir)/lib/pengine/libpe_rules.la \
- $(top_builddir)/lib/cib/libcib.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/common/libcrmcommon.la
--
-+ $(top_builddir)/lib/common/libcrmcommon.la \
-+ $(CLUSTERLIBS) -llrm
- if BUILD_XML_HELP
- man8_MANS = crmd.8
-
---- a/lib/common/Makefile.am
-+++ b/lib/common/Makefile.am
-@@ -38,7 +38,7 @@
- endif
-
- libcrmcluster_la_LDFLAGS = -version-info 1:0:0
--libcrmcluster_la_LIBADD = $(CLUSTERLIBS) libcrmcommon.la
-+libcrmcluster_la_LIBADD = libcrmcommon.la $(CLUSTERLIBS)
- libcrmcluster_la_DEPENDENCIES = libcrmcommon.la
-
- # Can't use -Wcast-qual here because glib insists on pretending things are const
-@@ -51,7 +51,8 @@
-
- libcrmcommon_la_SOURCES = ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c
-
--libcrmcommon_la_LDFLAGS = -version-info 2:0:0 $(GNUTLSLIBS)
-+libcrmcommon_la_LDFLAGS = -version-info 2:0:0
-+libcrmcommon_la_LIBADD = $(GNUTLSLIBS)
-
- clean-generic:
- rm -f *.log *.debug *.xml *~
---- a/lib/plugins/lrm/Makefile.am
-+++ b/lib/plugins/lrm/Makefile.am
-@@ -29,8 +29,8 @@
- plugin_LTLIBRARIES = stonith.la
-
- stonith_la_SOURCES = raexecstonith.c
--stonith_la_LDFLAGS = -lpils -export-dynamic -module -avoid-version \
-- $(top_builddir)/lib/fencing/libstonithd.la -llrm
-+stonith_la_LDFLAGS = -export-dynamic -module -avoid-version
-+stonith_la_LIBADD = $(top_builddir)/lib/fencing/libstonithd.la -lpils -llrm
-
- install-exec-local:
- $(mkinstalldirs) $(DESTDIR)$(lrmdir)
---- a/lib/fencing/Makefile.am
-+++ b/lib/fencing/Makefile.am
-@@ -25,8 +25,8 @@
- lib_LTLIBRARIES = libstonithd.la
-
- libstonithd_la_SOURCES = st_client.c
--libstonithd_la_LDFLAGS = -version-info 1:0:0 \
-- -lplumb -lstonith $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la
-+libstonithd_la_LDFLAGS = -version-info 1:0:0
-+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la \
-+ -lplumb -lstonith $(CLUSTERLIBS)
-
- AM_CFLAGS = $(INCLUDES)
---- a/cib/Makefile.am
-+++ b/cib/Makefile.am
-@@ -47,8 +47,8 @@
- cib_SOURCES = io.c messages.c notify.c \
- callbacks.c main.c remote.c common.c
-
--cib_LDADD = $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcluster.la
-+cib_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \
-+ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
-
- cibmon_SOURCES = cibmon.c
- cibmon_LDADD = $(COMMONLIBS)
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -62,8 +62,8 @@
- noinst_HEADERS =
-
- crmadmin_SOURCES = crmadmin.c
--crmadmin_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/pengine/libpe_status.la
-+crmadmin_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
-+ $(COMMONLIBS) $(CLUSTERLIBS)
-
- crm_uuid_SOURCES = crm_uuid.c
- crm_uuid_LDADD = $(top_builddir)/lib/common/libcrmcluster.la
-@@ -75,45 +75,45 @@
- crm_shadow_LDADD = $(COMMONLIBS)
-
- crm_node_SOURCES = ccm_epoche.c
--crm_node_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcluster.la
-+crm_node_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \
-+ $(COMMONLIBS) $(CLUSTERLIBS)
-
- crm_simulate_SOURCES = crm_inject.c
- crm_simulate_CFLAGS = -I$(top_srcdir)/pengine
-
--crm_simulate_LDADD = $(COMMONLIBS) \
-- $(top_builddir)/lib/pengine/libpe_status.la \
-+crm_simulate_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
- $(top_builddir)/pengine/libpengine.la \
- $(top_builddir)/lib/cib/libcib.la \
-- $(top_builddir)/lib/transition/libtransitioner.la
-+ $(top_builddir)/lib/transition/libtransitioner.la \
-+ $(COMMONLIBS)
-
- crm_diff_SOURCES = xml_diff.c
- crm_diff_LDADD = $(COMMONLIBS)
-
- crm_mon_SOURCES = crm_mon.c
--crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
-- $(top_builddir)/lib/pengine/libpe_status.la
-+crm_mon_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
-+ $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm
-
- # Arguments could be made that this should live in crm/pengine
- crm_verify_SOURCES = crm_verify.c
--crm_verify_LDADD = $(COMMONLIBS) \
-- $(top_builddir)/lib/pengine/libpe_status.la \
-- $(top_builddir)/pengine/libpengine.la
-+crm_verify_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
-+ $(top_builddir)/pengine/libpengine.la \
-+ $(COMMONLIBS)
-
- crm_attribute_SOURCES = crm_attribute.c
- crm_attribute_LDADD = $(COMMONLIBS)
-
- crm_resource_SOURCES = crm_resource.c
--crm_resource_LDADD = $(COMMONLIBS) \
-- $(top_builddir)/lib/pengine/libpe_rules.la \
-+crm_resource_LDADD = $(top_builddir)/lib/pengine/libpe_rules.la \
- $(top_builddir)/lib/pengine/libpe_status.la \
-- $(top_builddir)/pengine/libpengine.la
-+ $(top_builddir)/pengine/libpengine.la \
-+ $(COMMONLIBS)
-
- iso8601_SOURCES = test.iso8601.c
- iso8601_LDADD = $(COMMONLIBS)
-
- attrd_SOURCES = attrd.c
--attrd_LDADD = $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la
-+attrd_LDADD = $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS)
-
- #pingd_SOURCES = pingd.c
- #pingd_LDADD = $(COMMONLIBS)
-@@ -123,14 +123,14 @@
-
- if BUILD_SERVICELOG
- notifyServicelogEvent_SOURCES = notifyServicelogEvent.c
--notifyServicelogEvent_CFLAGS = `pkg-config --cflags servicelog-1`
--notifyServicelogEvent_LDFLAGS = `pkg-config --libs servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
-+notifyServicelogEvent_CFLAGS = $(SERVICELOG_CFLAGS)
-+notifyServicelogEvent_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS)
- endif
-
- if BUILD_OPENIPMI_SERVICELOG
- ipmiservicelogd_SOURCES = ipmiservicelogd.c
--ipmiservicelogd_CFLAGS = `pkg-config --cflags OpenIPMI OpenIPMIposix servicelog-1`
--ipmiservicelogd_LDFLAGS = `pkg-config --libs OpenIPMI OpenIPMIposix servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
-+ipmiservicelogd_CFLAGS = $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS)
-+ipmiservicelogd_LDFLAGS = $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
- endif
-
- %.8: % crm_attribute
---- a/extra/Makefile.am
-+++ b/extra/Makefile.am
-@@ -20,5 +20,5 @@
-
- SUBDIRS = resources
-
--mibdir = $(datadir)/snmp/mibs
-+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
- mib_DATA = PCMK-MIB.txt
---- a/fencing/Makefile.am 2011-02-25 09:58:45.621572915 +0100
-+++ b/fencing/Makefile.am 2011-02-25 10:00:39.024820006 +0100
-@@ -42,23 +42,23 @@
-
- stonith_test_SOURCES = test.c
-
--stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
-
- stonith_admin_SOURCES = admin.c
-
--stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-+stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/cib/libcib.la \
- $(top_builddir)/lib/pengine/libpe_status.la \
-- $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
-
- stonithd_SOURCES = main.c commands.c remote.c
-
--stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
---- a/pengine/Makefile.am
-+++ b/pengine/Makefile.am
-@@ -71,16 +71,17 @@
- libpengine_la_SOURCES = pengine.c allocate.c utils.c constraints.c \
- native.c group.c clone.c master.c graph.c
--libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la
-+libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la \
-+ $(top_builddir)/lib/cib/libcib.la
-
- pengine_SOURCES = main.c
--pengine_LDADD = $(COMMONLIBS) $(top_builddir)/lib/cib/libcib.la
-+pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
- # libcib for get_object_root()
- # $(top_builddir)/lib/hbclient/libhbclient.la
-
- ptest_SOURCES = ptest.c
--ptest_LDADD = $(COMMONLIBS) \
-- $(top_builddir)/lib/cib/libcib.la \
-- $(top_builddir)/lib/transition/libtransitioner.la
-+ptest_LDADD = $(top_builddir)/lib/cib/libcib.la \
-+ $(top_builddir)/lib/transition/libtransitioner.la \
-+ $(COMMONLIBS)
-
- install-exec-local:
- $(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
diff --git a/sys-cluster/pacemaker/files/pacemaker.initd b/sys-cluster/pacemaker/files/pacemaker.initd
deleted file mode 100644
index 4231425..0000000
--- a/sys-cluster/pacemaker/files/pacemaker.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.initd,v 1.1 2011/02/21 14:39:28 ultrabug Exp $
-
-PIDFILE=/var/run/pacemaker.pid
-
-depend() {
- need net corosync
- use syslog
-}
-
-start() {
- nc=0
- ebegin "Starting Pacemaker Cluster Manager"
- einfon "Waiting for Corosync startup ."
- while true; do
- /usr/sbin/corosync-cfgtool -s &>/dev/null && break
- nc=$(expr $nc + 1)
- if [ $nc -gt 30 ]; then
- echo
- eend 1 "Failed to detect Corosync startup, is it really running ?"
- exit 1
- fi
- sleep 1
- echo -n "."
- done
- echo
- start-stop-daemon --start -q --exec /usr/sbin/pacemakerd \
- --pidfile "${PIDFILE}" --make-pidfile --background \
- -- -f
- eend $?
-}
-
-stop() {
- ebegin "Stopping Pacemaker Cluster Manager"
- start-stop-daemon --stop -q --pidfile "${PIDFILE}"
- eend $?
-}
diff --git a/sys-cluster/pacemaker/files/pacemaker.service b/sys-cluster/pacemaker/files/pacemaker.service
deleted file mode 100644
index 6383499..0000000
--- a/sys-cluster/pacemaker/files/pacemaker.service
+++ /dev/null
@@ -1,5 +0,0 @@
-service {
- # Load the Pacemaker Cluster Resource Manager
- name: pacemaker
- ver: 1
-}
\ No newline at end of file
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.5-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.5-r1.ebuild
deleted file mode 100644
index b59db5c..0000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild,v 1.2 2011/07/08 14:02:02 xarthisius Exp $
-
-EAPI=3
-
-inherit autotools base python
-
-MY_PN=Pacemaker
-MY_P=${MY_PN}-${PV}
-PYTHON_DEPEND="2"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="
- dev-libs/libxslt
- sys-cluster/corosync
- sys-cluster/cluster-glue
- sys-cluster/resource-agents
- cman? ( sys-cluster/cman )
- heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
- smtp? ( net-libs/libesmtp )
- snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-autotools.patch"
-)
-
-S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- base_src_prepare
- sed -i -e "/ggdb3/d" configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local myopts=""
- use heartbeat || myopts="--with-ais"
- # appends lib to localstatedir automatically
- econf \
- --localstatedir=/var \
- --disable-dependency-tracking \
- --disable-fatal-warnings \
- $(use_with acl) \
- $(use_with cman cs-quorum) \
- $(use_with cman cman) \
- $(use_with heartbeat) \
- $(use_with smtp esmtp) \
- $(use_with snmp) \
- $(use_enable static-libs static) \
- ${myopts}
-}
-
-src_install() {
- base_src_install
- newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
- insinto /etc/corosync/service.d
- newins "${FILESDIR}/${PN}.service" ${PN} || die
-}
-
-pkg_postinst() {
- elog "This version of Pacemaker uses the new MCP feature"
- elog "and the v1 plugin for CoroSync. Read [1] for more info."
- elog
- elog "To start the Pacemaker Cluster Manager, run:"
- elog "/etc/init.d/pacemaker start"
- elog
- elog "[1] http://theclusterguy.clusterlabs.org/post/907043024/introducing-the-pacemaker-master-control-process-for"
- elog
- elog "Note: sys-cluster/openais is no longer a hard dependency of ${P},"
- elog "so you may need to install it yourself to suit your needs."
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-15 14:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-25 10:49 [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/ Alexys Jacob
-- strict thread matches above, loose matches on Subject: below --
2011-09-15 14:59 Alexys Jacob
2011-02-22 12:53 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox