Gentoo Archives: gentoo-commits

From: Alexys Jacob <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/
Date: Mon, 21 Feb 2011 14:49:27
Message-Id: b1d3f79f7f2c4cf28489f556a2f339c4f0c19f34.ultrabug@gentoo
1 commit: b1d3f79f7f2c4cf28489f556a2f339c4f0c19f34
2 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 14:40:37 2011 +0000
4 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 21 14:40:37 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b1d3f79f
7
8 moved to g-x86
9
10 ---
11 .../files/pacemaker-1.1.4-autotools-r2.patch | 287 --------------------
12 sys-cluster/pacemaker/files/pacemaker.initd | 39 ---
13 sys-cluster/pacemaker/files/pacemaker.service | 5 -
14 sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild | 84 ------
15 4 files changed, 0 insertions(+), 415 deletions(-)
16
17 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
18 deleted file mode 100644
19 index a3aad64..0000000
20 --- a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
21 +++ /dev/null
22 @@ -1,287 +0,0 @@
23 ---- a/configure.ac
24 -+++ b/configure.ac
25 -@@ -1354,6 +1354,7 @@
26 - if
27 - $PKGCONFIG --exists $SERVICELOG
28 - then
29 -+ PKG_CHECK_MODULES([SERVICELOG], [servicelog-1])
30 - SERVICELOG_EXISTS="yes"
31 - fi
32 - AC_MSG_RESULT($SERVICELOG_EXISTS)
33 -@@ -1366,6 +1367,7 @@
34 - if
35 - $PKGCONFIG --exists $OPENIPMI $SERVICELOG
36 - then
37 -+ PKG_CHECK_MODULES([OPENIPMI_SERVICELOG],[OpenIPMI OpenIPMIposix])
38 - OPENIPMI_SERVICELOG_EXISTS="yes"
39 - fi
40 - AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
41 ---- a/fencing/Makefile.am
42 -+++ b/fencing/Makefile.am
43 -@@ -36,21 +36,20 @@
44 -
45 - stonith_test_SOURCES = test.c
46 -
47 --stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
48 -- $(top_builddir)/lib/common/libcrmcommon.la \
49 -+stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
50 - $(top_builddir)/lib/common/libcrmcluster.la \
51 -- $(top_builddir)/lib/fencing/libstonithd.la
52 -+ $(top_builddir)/lib/fencing/libstonithd.la \
53 -+ $(CRYPTOLIB) $(CLUSTERLIBS)
54 -
55 - stonith_admin_SOURCES = admin.c
56 -
57 --stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
58 -- $(top_builddir)/lib/common/libcrmcommon.la \
59 -+stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
60 - $(top_builddir)/lib/common/libcrmcluster.la \
61 -- $(top_builddir)/lib/fencing/libstonithd.la
62 --
63 -+ $(top_builddir)/lib/fencing/libstonithd.la \
64 -+ $(CRYPTOLIB) $(CLUSTERLIBS)
65 - stonithd_SOURCES = main.c commands.c remote.c
66 -
67 --stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
68 -- $(top_builddir)/lib/common/libcrmcommon.la \
69 -+stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
70 - $(top_builddir)/lib/common/libcrmcluster.la \
71 -- $(top_builddir)/lib/fencing/libstonithd.la
72 -+ $(top_builddir)/lib/fencing/libstonithd.la \
73 -+ $(CRYPTOLIB) $(CLUSTERLIBS)
74 ---- a/mcp/Makefile.am
75 -+++ b/mcp/Makefile.am
76 -@@ -34,7 +34,7 @@
77 - noinst_HEADERS =
78 -
79 - pacemakerd_SOURCES = pacemaker.c corosync.c
80 --pacemakerd_LDADD = $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -lcfg -lconfdb
81 -+pacemakerd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) -lcfg -lconfdb
82 -
83 - %.8: %
84 - echo Creating $@
85 ---- a/crmd/Makefile.am
86 -+++ b/crmd/Makefile.am
87 -@@ -41,14 +41,13 @@
88 - cib.c pengine.c tengine.c lrm.c \
89 - utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
90 -
91 --crmd_LDADD = $(CLUSTERLIBS) -llrm \
92 -- $(top_builddir)/lib/fencing/libstonithd.la \
93 -+crmd_LDADD = $(top_builddir)/lib/fencing/libstonithd.la \
94 - $(top_builddir)/lib/transition/libtransitioner.la \
95 - $(top_builddir)/lib/pengine/libpe_rules.la \
96 - $(top_builddir)/lib/cib/libcib.la \
97 - $(top_builddir)/lib/common/libcrmcluster.la \
98 -- $(top_builddir)/lib/common/libcrmcommon.la
99 --
100 -+ $(top_builddir)/lib/common/libcrmcommon.la \
101 -+ $(CLUSTERLIBS) -llrm
102 - if BUILD_XML_HELP
103 - man8_MANS = crmd.8
104 -
105 ---- a/pengine/Makefile.am
106 -+++ b/pengine/Makefile.am
107 -@@ -73,14 +73,14 @@
108 - libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la
109 -
110 - pengine_SOURCES = main.c
111 --pengine_LDADD = $(COMMONLIBS) $(top_builddir)/lib/cib/libcib.la
112 -+pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
113 - # libcib for get_object_root()
114 - # $(top_builddir)/lib/hbclient/libhbclient.la
115 -
116 - ptest_SOURCES = ptest.c
117 --ptest_LDADD = $(COMMONLIBS) \
118 -- $(top_builddir)/lib/cib/libcib.la \
119 -- $(top_builddir)/lib/transition/libtransitioner.la
120 -+ptest_LDADD = $(top_builddir)/lib/cib/libcib.la \
121 -+ $(top_builddir)/lib/transition/libtransitioner.la \
122 -+ $(COMMONLIBS)
123 -
124 - install-exec-local:
125 - $(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
126 ---- a/lib/common/Makefile.am
127 -+++ b/lib/common/Makefile.am
128 -@@ -38,7 +38,7 @@
129 - endif
130 -
131 - libcrmcluster_la_LDFLAGS = -version-info 1:0:0
132 --libcrmcluster_la_LIBADD = $(CLUSTERLIBS) libcrmcommon.la
133 -+libcrmcluster_la_LIBADD = libcrmcommon.la $(CLUSTERLIBS)
134 - libcrmcluster_la_DEPENDENCIES = libcrmcommon.la
135 -
136 - # Can't use -Wcast-qual here because glib insists on pretending things are const
137 -@@ -51,7 +51,8 @@
138 -
139 - libcrmcommon_la_SOURCES = ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c
140 -
141 --libcrmcommon_la_LDFLAGS = -version-info 2:0:0 $(GNUTLSLIBS)
142 -+libcrmcommon_la_LDFLAGS = -version-info 2:0:0
143 -+libcrmcommon_la_LIBADD = $(GNUTLSLIBS)
144 -
145 - clean-generic:
146 - rm -f *.log *.debug *.xml *~
147 ---- a/lib/plugins/lrm/Makefile.am
148 -+++ b/lib/plugins/lrm/Makefile.am
149 -@@ -29,8 +29,8 @@
150 - plugin_LTLIBRARIES = stonith.la
151 -
152 - stonith_la_SOURCES = raexecstonith.c
153 --stonith_la_LDFLAGS = -lpils -export-dynamic -module -avoid-version \
154 -- $(top_builddir)/lib/fencing/libstonithd.la -llrm
155 -+stonith_la_LDFLAGS = -export-dynamic -module -avoid-version
156 -+stonith_la_LIBADD = $(top_builddir)/lib/fencing/libstonithd.la -lpils -llrm
157 -
158 - install-exec-local:
159 - $(mkinstalldirs) $(DESTDIR)$(lrmdir)
160 ---- a/lib/fencing/Makefile.am
161 -+++ b/lib/fencing/Makefile.am
162 -@@ -25,8 +25,8 @@
163 - lib_LTLIBRARIES = libstonithd.la
164 -
165 - libstonithd_la_SOURCES = st_client.c
166 --libstonithd_la_LDFLAGS = -version-info 1:0:0 \
167 -- -lplumb -lstonith $(CLUSTERLIBS) \
168 -- $(top_builddir)/lib/common/libcrmcommon.la
169 -+libstonithd_la_LDFLAGS = -version-info 1:0:0
170 -+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la \
171 -+ -lplumb -lstonith $(CLUSTERLIBS)
172 -
173 - AM_CFLAGS = $(INCLUDES)
174 ---- a/cib/Makefile.am
175 -+++ b/cib/Makefile.am
176 -@@ -47,8 +47,8 @@
177 - cib_SOURCES = io.c messages.c notify.c \
178 - callbacks.c main.c remote.c common.c
179 -
180 --cib_LDADD = $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) \
181 -- $(top_builddir)/lib/common/libcrmcluster.la
182 -+cib_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \
183 -+ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
184 -
185 - cibmon_SOURCES = cibmon.c
186 - cibmon_LDADD = $(COMMONLIBS)
187 ---- a/tools/Makefile.am
188 -+++ b/tools/Makefile.am
189 -@@ -62,8 +62,8 @@
190 - noinst_HEADERS =
191 -
192 - crmadmin_SOURCES = crmadmin.c
193 --crmadmin_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \
194 -- $(top_builddir)/lib/pengine/libpe_status.la
195 -+crmadmin_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
196 -+ $(COMMONLIBS) $(CLUSTERLIBS)
197 -
198 - crm_uuid_SOURCES = crm_uuid.c
199 - crm_uuid_LDADD = $(top_builddir)/lib/common/libcrmcluster.la
200 -@@ -75,45 +75,45 @@
201 - crm_shadow_LDADD = $(COMMONLIBS)
202 -
203 - crm_node_SOURCES = ccm_epoche.c
204 --crm_node_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \
205 -- $(top_builddir)/lib/common/libcrmcluster.la
206 -+crm_node_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \
207 -+ $(COMMONLIBS) $(CLUSTERLIBS)
208 -
209 - crm_simulate_SOURCES = crm_inject.c
210 - crm_simulate_CFLAGS = -I$(top_srcdir)/pengine
211 -
212 --crm_simulate_LDADD = $(COMMONLIBS) \
213 -- $(top_builddir)/lib/pengine/libpe_status.la \
214 -+crm_simulate_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
215 - $(top_builddir)/pengine/libpengine.la \
216 - $(top_builddir)/lib/cib/libcib.la \
217 -- $(top_builddir)/lib/transition/libtransitioner.la
218 -+ $(top_builddir)/lib/transition/libtransitioner.la \
219 -+ $(COMMONLIBS)
220 -
221 - crm_diff_SOURCES = xml_diff.c
222 - crm_diff_LDADD = $(COMMONLIBS)
223 -
224 - crm_mon_SOURCES = crm_mon.c
225 --crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
226 -- $(top_builddir)/lib/pengine/libpe_status.la
227 -+crm_mon_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
228 -+ $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm
229 -
230 - # Arguments could be made that this should live in crm/pengine
231 - crm_verify_SOURCES = crm_verify.c
232 --crm_verify_LDADD = $(COMMONLIBS) \
233 -- $(top_builddir)/lib/pengine/libpe_status.la \
234 -- $(top_builddir)/pengine/libpengine.la
235 -+crm_verify_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \
236 -+ $(top_builddir)/pengine/libpengine.la \
237 -+ $(COMMONLIBS)
238 -
239 - crm_attribute_SOURCES = crm_attribute.c
240 - crm_attribute_LDADD = $(COMMONLIBS)
241 -
242 - crm_resource_SOURCES = crm_resource.c
243 --crm_resource_LDADD = $(COMMONLIBS) \
244 -- $(top_builddir)/lib/pengine/libpe_rules.la \
245 -+crm_resource_LDADD = $(top_builddir)/lib/pengine/libpe_rules.la \
246 - $(top_builddir)/lib/pengine/libpe_status.la \
247 -- $(top_builddir)/pengine/libpengine.la
248 -+ $(top_builddir)/pengine/libpengine.la \
249 -+ $(COMMONLIBS)
250 -
251 - iso8601_SOURCES = test.iso8601.c
252 - iso8601_LDADD = $(COMMONLIBS)
253 -
254 - attrd_SOURCES = attrd.c
255 --attrd_LDADD = $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la
256 -+attrd_LDADD = $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS)
257 -
258 - #pingd_SOURCES = pingd.c
259 - #pingd_LDADD = $(COMMONLIBS)
260 -@@ -123,14 +123,14 @@
261 -
262 - if BUILD_SERVICELOG
263 - notifyServicelogEvent_SOURCES = notifyServicelogEvent.c
264 --notifyServicelogEvent_CFLAGS = `pkg-config --cflags servicelog-1`
265 --notifyServicelogEvent_LDFLAGS = `pkg-config --libs servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
266 -+notifyServicelogEvent_CFLAGS = $(SERVICELOG_CFLAGS)
267 -+notifyServicelogEvent_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS)
268 - endif
269 -
270 - if BUILD_OPENIPMI_SERVICELOG
271 - ipmiservicelogd_SOURCES = ipmiservicelogd.c
272 --ipmiservicelogd_CFLAGS = `pkg-config --cflags OpenIPMI OpenIPMIposix servicelog-1`
273 --ipmiservicelogd_LDFLAGS = `pkg-config --libs OpenIPMI OpenIPMIposix servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
274 -+ipmiservicelogd_CFLAGS = $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS)
275 -+ipmiservicelogd_LDFLAGS = $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
276 - endif
277 -
278 - %.8: % crm_attribute
279 ---- a/extra/Makefile.am
280 -+++ b/extra/Makefile.am
281 -@@ -20,5 +20,5 @@
282 -
283 - SUBDIRS = resources
284 -
285 --mibdir = $(datadir)/snmp/mibs
286 -+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
287 - mib_DATA = PCMK-MIB.txt
288 ---- a/lib/pengine/Makefile.am
289 -+++ b/lib/pengine/Makefile.am
290 -@@ -34,7 +34,7 @@
291 -
292 - libpe_status_la_LDFLAGS = -version-info 3:0:0
293 - libpe_status_la_SOURCES = $(rule_files) $(status_files)
294 --libpe_status_la_LIBADD = -llrm @CURSESLIBS@
295 -+libpe_status_la_LIBADD = $(top_builddir)/lib/cib/libcib.la -llrm @CURSESLIBS@
296 -
297 - clean-generic:
298 - rm -f *.log *.debug *~
299 ---- a/lib/Makefile.am
300 -+++ b/lib/Makefile.am
301 -@@ -18,7 +18,7 @@
302 - MAINTAINERCLEANFILES = Makefile.in
303 -
304 - ## Subdirectories...
305 --SUBDIRS = common pengine transition cib fencing plugins
306 -+SUBDIRS = common cib pengine transition fencing plugins
307 - DIST_SUBDIRS = $(SUBDIRS) ais
308 -
309 - if BUILD_CS_SUPPORT
310
311 diff --git a/sys-cluster/pacemaker/files/pacemaker.initd b/sys-cluster/pacemaker/files/pacemaker.initd
312 deleted file mode 100644
313 index 3e47654..0000000
314 --- a/sys-cluster/pacemaker/files/pacemaker.initd
315 +++ /dev/null
316 @@ -1,39 +0,0 @@
317 -#!/sbin/runscript
318 -# Copyright 1999-2010 Gentoo Foundation
319 -# Distributed under the terms of the GNU General Public License v2
320 -# $Header: $
321 -
322 -PIDFILE=/var/run/pacemaker.pid
323 -
324 -depend() {
325 - need net corosync
326 - use syslog
327 -}
328 -
329 -start() {
330 - nc=0
331 - ebegin "Starting Pacemaker Cluster Manager"
332 - einfon "Waiting for Corosync startup ."
333 - while true; do
334 - /usr/sbin/corosync-cfgtool -s &>/dev/null && break
335 - nc=$(expr $nc + 1)
336 - if [ $nc -gt 30 ]; then
337 - echo
338 - eend 1 "Failed to detect Corosync startup, is it really running ?"
339 - exit 1
340 - fi
341 - sleep 1
342 - echo -n "."
343 - done
344 - echo
345 - start-stop-daemon --start -q --exec /usr/sbin/pacemakerd \
346 - --pidfile "${PIDFILE}" --make-pidfile --background \
347 - -- -f
348 - eend $?
349 -}
350 -
351 -stop() {
352 - ebegin "Stopping Pacemaker Cluster Manager"
353 - start-stop-daemon --stop -q --pidfile "${PIDFILE}"
354 - eend $?
355 -}
356
357 diff --git a/sys-cluster/pacemaker/files/pacemaker.service b/sys-cluster/pacemaker/files/pacemaker.service
358 deleted file mode 100644
359 index 6383499..0000000
360 --- a/sys-cluster/pacemaker/files/pacemaker.service
361 +++ /dev/null
362 @@ -1,5 +0,0 @@
363 -service {
364 - # Load the Pacemaker Cluster Resource Manager
365 - name: pacemaker
366 - ver: 1
367 -}
368 \ No newline at end of file
369
370 diff --git a/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild
371 deleted file mode 100644
372 index d95597b..0000000
373 --- a/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild
374 +++ /dev/null
375 @@ -1,84 +0,0 @@
376 -# Copyright 1999-2010 Gentoo Foundation
377 -# Distributed under the terms of the GNU General Public License v2
378 -# $Header: $
379 -
380 -EAPI="2"
381 -
382 -MY_PN="Pacemaker"
383 -MY_P="${MY_PN}-${PV}"
384 -PYTHON_DEPEND="2"
385 -inherit autotools base eutils flag-o-matic multilib python
386 -
387 -DESCRIPTION="Pacemaker CRM"
388 -HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
389 -SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
390 -
391 -LICENSE="GPL-2"
392 -SLOT="0"
393 -KEYWORDS="~amd64 ~x86"
394 -IUSE="heartbeat smtp snmp static-libs"
395 -
396 -RDEPEND="
397 - dev-libs/libxslt
398 - sys-cluster/corosync
399 - sys-cluster/cluster-glue
400 - sys-cluster/resource-agents
401 - heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
402 - smtp? ( net-libs/libesmtp )
403 - snmp? ( net-analyzer/net-snmp )
404 -"
405 -DEPEND="${RDEPEND}"
406 -
407 -PATCHES=(
408 - "${FILESDIR}/${P}-autotools-r2.patch"
409 -)
410 -
411 -S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
412 -
413 -pkg_setup() {
414 - python_set_active_version 2
415 - python_pkg_setup
416 -}
417 -
418 -src_prepare() {
419 - base_src_prepare
420 - sed -i -e "/ggdb3/d" configure.ac || die
421 - eautoreconf
422 -}
423 -
424 -src_configure() {
425 - local myopts=""
426 - use heartbeat || myopts="--with-ais"
427 - # appends lib to localstatedir automatically
428 - econf \
429 - --localstatedir=/var \
430 - --disable-dependency-tracking \
431 - --disable-fatal-warnings \
432 - --with-cs-quorum \
433 - --without-cman \
434 - $(use_with smtp esmtp) \
435 - $(use_with heartbeat) \
436 - $(use_with snmp) \
437 - $(use_enable static-libs static) \
438 - ${myopts}
439 -}
440 -
441 -src_install() {
442 - base_src_install
443 - newinitd "${FILESDIR}/pacemaker.initd" pacemaker || die
444 - insinto /etc/corosync/service.d
445 - newins "${FILESDIR}/pacemaker.service" pacemaker || die
446 -}
447 -
448 -pkg_postinst() {
449 - elog "This version of Pacemaker uses the new MCP feature"
450 - elog "and the v1 plugin for CoroSync. Read [1] for more info."
451 - elog
452 - elog "To start the Pacemaker Cluster Manager, run:"
453 - elog "/etc/init.d/pacemaker start"
454 - elog
455 - elog "[1] http://theclusterguy.clusterlabs.org/post/907043024/introducing-the-pacemaker-master-control-process-for"
456 - elog
457 - elog "Note: sys-cluster/openais is no longer a hard dependency of ${P},"
458 - elog "so you may need to install it yourself to suit your needs."
459 -}