| 1 |
ultrabug 11/02/21 14:39:28 |
| 2 |
|
| 3 |
Added: pacemaker-1.1.4-autotools-r2.patch |
| 4 |
pacemaker.service pacemaker.initd |
| 5 |
Log: |
| 6 |
pacemaker 1.1.x series bump |
| 7 |
|
| 8 |
(Portage version: 2.1.9.40/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: pacemaker-1.1.4-autotools-r2.patch |
| 17 |
=================================================================== |
| 18 |
--- a/configure.ac |
| 19 |
+++ b/configure.ac |
| 20 |
@@ -1354,6 +1354,7 @@ |
| 21 |
if |
| 22 |
$PKGCONFIG --exists $SERVICELOG |
| 23 |
then |
| 24 |
+ PKG_CHECK_MODULES([SERVICELOG], [servicelog-1]) |
| 25 |
SERVICELOG_EXISTS="yes" |
| 26 |
fi |
| 27 |
AC_MSG_RESULT($SERVICELOG_EXISTS) |
| 28 |
@@ -1366,6 +1367,7 @@ |
| 29 |
if |
| 30 |
$PKGCONFIG --exists $OPENIPMI $SERVICELOG |
| 31 |
then |
| 32 |
+ PKG_CHECK_MODULES([OPENIPMI_SERVICELOG],[OpenIPMI OpenIPMIposix]) |
| 33 |
OPENIPMI_SERVICELOG_EXISTS="yes" |
| 34 |
fi |
| 35 |
AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS) |
| 36 |
--- a/fencing/Makefile.am |
| 37 |
+++ b/fencing/Makefile.am |
| 38 |
@@ -36,21 +36,20 @@ |
| 39 |
|
| 40 |
stonith_test_SOURCES = test.c |
| 41 |
|
| 42 |
-stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \ |
| 43 |
- $(top_builddir)/lib/common/libcrmcommon.la \ |
| 44 |
+stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \ |
| 45 |
$(top_builddir)/lib/common/libcrmcluster.la \ |
| 46 |
- $(top_builddir)/lib/fencing/libstonithd.la |
| 47 |
+ $(top_builddir)/lib/fencing/libstonithd.la \ |
| 48 |
+ $(CRYPTOLIB) $(CLUSTERLIBS) |
| 49 |
|
| 50 |
stonith_admin_SOURCES = admin.c |
| 51 |
|
| 52 |
-stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \ |
| 53 |
- $(top_builddir)/lib/common/libcrmcommon.la \ |
| 54 |
+stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \ |
| 55 |
$(top_builddir)/lib/common/libcrmcluster.la \ |
| 56 |
- $(top_builddir)/lib/fencing/libstonithd.la |
| 57 |
- |
| 58 |
+ $(top_builddir)/lib/fencing/libstonithd.la \ |
| 59 |
+ $(CRYPTOLIB) $(CLUSTERLIBS) |
| 60 |
stonithd_SOURCES = main.c commands.c remote.c |
| 61 |
|
| 62 |
-stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \ |
| 63 |
- $(top_builddir)/lib/common/libcrmcommon.la \ |
| 64 |
+stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \ |
| 65 |
$(top_builddir)/lib/common/libcrmcluster.la \ |
| 66 |
- $(top_builddir)/lib/fencing/libstonithd.la |
| 67 |
+ $(top_builddir)/lib/fencing/libstonithd.la \ |
| 68 |
+ $(CRYPTOLIB) $(CLUSTERLIBS) |
| 69 |
--- a/mcp/Makefile.am |
| 70 |
+++ b/mcp/Makefile.am |
| 71 |
@@ -34,7 +34,7 @@ |
| 72 |
noinst_HEADERS = |
| 73 |
|
| 74 |
pacemakerd_SOURCES = pacemaker.c corosync.c |
| 75 |
-pacemakerd_LDADD = $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -lcfg -lconfdb |
| 76 |
+pacemakerd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) -lcfg -lconfdb |
| 77 |
|
| 78 |
%.8: % |
| 79 |
echo Creating $@ |
| 80 |
--- a/crmd/Makefile.am |
| 81 |
+++ b/crmd/Makefile.am |
| 82 |
@@ -41,14 +41,13 @@ |
| 83 |
cib.c pengine.c tengine.c lrm.c \ |
| 84 |
utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c |
| 85 |
|
| 86 |
-crmd_LDADD = $(CLUSTERLIBS) -llrm \ |
| 87 |
- $(top_builddir)/lib/fencing/libstonithd.la \ |
| 88 |
+crmd_LDADD = $(top_builddir)/lib/fencing/libstonithd.la \ |
| 89 |
$(top_builddir)/lib/transition/libtransitioner.la \ |
| 90 |
$(top_builddir)/lib/pengine/libpe_rules.la \ |
| 91 |
$(top_builddir)/lib/cib/libcib.la \ |
| 92 |
$(top_builddir)/lib/common/libcrmcluster.la \ |
| 93 |
- $(top_builddir)/lib/common/libcrmcommon.la |
| 94 |
- |
| 95 |
+ $(top_builddir)/lib/common/libcrmcommon.la \ |
| 96 |
+ $(CLUSTERLIBS) -llrm |
| 97 |
if BUILD_XML_HELP |
| 98 |
man8_MANS = crmd.8 |
| 99 |
|
| 100 |
--- a/pengine/Makefile.am |
| 101 |
+++ b/pengine/Makefile.am |
| 102 |
@@ -73,14 +73,14 @@ |
| 103 |
libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la |
| 104 |
|
| 105 |
pengine_SOURCES = main.c |
| 106 |
-pengine_LDADD = $(COMMONLIBS) $(top_builddir)/lib/cib/libcib.la |
| 107 |
+pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) |
| 108 |
# libcib for get_object_root() |
| 109 |
# $(top_builddir)/lib/hbclient/libhbclient.la |
| 110 |
|
| 111 |
ptest_SOURCES = ptest.c |
| 112 |
-ptest_LDADD = $(COMMONLIBS) \ |
| 113 |
- $(top_builddir)/lib/cib/libcib.la \ |
| 114 |
- $(top_builddir)/lib/transition/libtransitioner.la |
| 115 |
+ptest_LDADD = $(top_builddir)/lib/cib/libcib.la \ |
| 116 |
+ $(top_builddir)/lib/transition/libtransitioner.la \ |
| 117 |
+ $(COMMONLIBS) |
| 118 |
|
| 119 |
install-exec-local: |
| 120 |
$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR) |
| 121 |
--- a/lib/common/Makefile.am |
| 122 |
+++ b/lib/common/Makefile.am |
| 123 |
@@ -38,7 +38,7 @@ |
| 124 |
endif |
| 125 |
|
| 126 |
libcrmcluster_la_LDFLAGS = -version-info 1:0:0 |
| 127 |
-libcrmcluster_la_LIBADD = $(CLUSTERLIBS) libcrmcommon.la |
| 128 |
+libcrmcluster_la_LIBADD = libcrmcommon.la $(CLUSTERLIBS) |
| 129 |
libcrmcluster_la_DEPENDENCIES = libcrmcommon.la |
| 130 |
|
| 131 |
# Can't use -Wcast-qual here because glib insists on pretending things are const |
| 132 |
@@ -51,7 +51,8 @@ |
| 133 |
|
| 134 |
libcrmcommon_la_SOURCES = ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c |
| 135 |
|
| 136 |
-libcrmcommon_la_LDFLAGS = -version-info 2:0:0 $(GNUTLSLIBS) |
| 137 |
+libcrmcommon_la_LDFLAGS = -version-info 2:0:0 |
| 138 |
+libcrmcommon_la_LIBADD = $(GNUTLSLIBS) |
| 139 |
|
| 140 |
clean-generic: |
| 141 |
rm -f *.log *.debug *.xml *~ |
| 142 |
--- a/lib/plugins/lrm/Makefile.am |
| 143 |
+++ b/lib/plugins/lrm/Makefile.am |
| 144 |
@@ -29,8 +29,8 @@ |
| 145 |
plugin_LTLIBRARIES = stonith.la |
| 146 |
|
| 147 |
stonith_la_SOURCES = raexecstonith.c |
| 148 |
-stonith_la_LDFLAGS = -lpils -export-dynamic -module -avoid-version \ |
| 149 |
- $(top_builddir)/lib/fencing/libstonithd.la -llrm |
| 150 |
+stonith_la_LDFLAGS = -export-dynamic -module -avoid-version |
| 151 |
+stonith_la_LIBADD = $(top_builddir)/lib/fencing/libstonithd.la -lpils -llrm |
| 152 |
|
| 153 |
install-exec-local: |
| 154 |
$(mkinstalldirs) $(DESTDIR)$(lrmdir) |
| 155 |
--- a/lib/fencing/Makefile.am |
| 156 |
+++ b/lib/fencing/Makefile.am |
| 157 |
@@ -25,8 +25,8 @@ |
| 158 |
lib_LTLIBRARIES = libstonithd.la |
| 159 |
|
| 160 |
libstonithd_la_SOURCES = st_client.c |
| 161 |
-libstonithd_la_LDFLAGS = -version-info 1:0:0 \ |
| 162 |
- -lplumb -lstonith $(CLUSTERLIBS) \ |
| 163 |
- $(top_builddir)/lib/common/libcrmcommon.la |
| 164 |
+libstonithd_la_LDFLAGS = -version-info 1:0:0 |
| 165 |
+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la \ |
| 166 |
+ -lplumb -lstonith $(CLUSTERLIBS) |
| 167 |
|
| 168 |
AM_CFLAGS = $(INCLUDES) |
| 169 |
--- a/cib/Makefile.am |
| 170 |
+++ b/cib/Makefile.am |
| 171 |
@@ -47,8 +47,8 @@ |
| 172 |
cib_SOURCES = io.c messages.c notify.c \ |
| 173 |
callbacks.c main.c remote.c common.c |
| 174 |
|
| 175 |
-cib_LDADD = $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) \ |
| 176 |
- $(top_builddir)/lib/common/libcrmcluster.la |
| 177 |
+cib_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \ |
| 178 |
+ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) |
| 179 |
|
| 180 |
cibmon_SOURCES = cibmon.c |
| 181 |
cibmon_LDADD = $(COMMONLIBS) |
| 182 |
--- a/tools/Makefile.am |
| 183 |
+++ b/tools/Makefile.am |
| 184 |
@@ -62,8 +62,8 @@ |
| 185 |
noinst_HEADERS = |
| 186 |
|
| 187 |
crmadmin_SOURCES = crmadmin.c |
| 188 |
-crmadmin_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \ |
| 189 |
- $(top_builddir)/lib/pengine/libpe_status.la |
| 190 |
+crmadmin_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \ |
| 191 |
+ $(COMMONLIBS) $(CLUSTERLIBS) |
| 192 |
|
| 193 |
crm_uuid_SOURCES = crm_uuid.c |
| 194 |
crm_uuid_LDADD = $(top_builddir)/lib/common/libcrmcluster.la |
| 195 |
@@ -75,45 +75,45 @@ |
| 196 |
crm_shadow_LDADD = $(COMMONLIBS) |
| 197 |
|
| 198 |
crm_node_SOURCES = ccm_epoche.c |
| 199 |
-crm_node_LDADD = $(COMMONLIBS) $(CLUSTERLIBS) \ |
| 200 |
- $(top_builddir)/lib/common/libcrmcluster.la |
| 201 |
+crm_node_LDADD = $(top_builddir)/lib/common/libcrmcluster.la \ |
| 202 |
+ $(COMMONLIBS) $(CLUSTERLIBS) |
| 203 |
|
| 204 |
crm_simulate_SOURCES = crm_inject.c |
| 205 |
crm_simulate_CFLAGS = -I$(top_srcdir)/pengine |
| 206 |
|
| 207 |
-crm_simulate_LDADD = $(COMMONLIBS) \ |
| 208 |
- $(top_builddir)/lib/pengine/libpe_status.la \ |
| 209 |
+crm_simulate_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \ |
| 210 |
$(top_builddir)/pengine/libpengine.la \ |
| 211 |
$(top_builddir)/lib/cib/libcib.la \ |
| 212 |
- $(top_builddir)/lib/transition/libtransitioner.la |
| 213 |
+ $(top_builddir)/lib/transition/libtransitioner.la \ |
| 214 |
+ $(COMMONLIBS) |
| 215 |
|
| 216 |
crm_diff_SOURCES = xml_diff.c |
| 217 |
crm_diff_LDADD = $(COMMONLIBS) |
| 218 |
|
| 219 |
crm_mon_SOURCES = crm_mon.c |
| 220 |
-crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \ |
| 221 |
- $(top_builddir)/lib/pengine/libpe_status.la |
| 222 |
+crm_mon_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \ |
| 223 |
+ $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm |
| 224 |
|
| 225 |
# Arguments could be made that this should live in crm/pengine |
| 226 |
crm_verify_SOURCES = crm_verify.c |
| 227 |
-crm_verify_LDADD = $(COMMONLIBS) \ |
| 228 |
- $(top_builddir)/lib/pengine/libpe_status.la \ |
| 229 |
- $(top_builddir)/pengine/libpengine.la |
| 230 |
+crm_verify_LDADD = $(top_builddir)/lib/pengine/libpe_status.la \ |
| 231 |
+ $(top_builddir)/pengine/libpengine.la \ |
| 232 |
+ $(COMMONLIBS) |
| 233 |
|
| 234 |
crm_attribute_SOURCES = crm_attribute.c |
| 235 |
crm_attribute_LDADD = $(COMMONLIBS) |
| 236 |
|
| 237 |
crm_resource_SOURCES = crm_resource.c |
| 238 |
-crm_resource_LDADD = $(COMMONLIBS) \ |
| 239 |
- $(top_builddir)/lib/pengine/libpe_rules.la \ |
| 240 |
+crm_resource_LDADD = $(top_builddir)/lib/pengine/libpe_rules.la \ |
| 241 |
$(top_builddir)/lib/pengine/libpe_status.la \ |
| 242 |
- $(top_builddir)/pengine/libpengine.la |
| 243 |
+ $(top_builddir)/pengine/libpengine.la \ |
| 244 |
+ $(COMMONLIBS) |
| 245 |
|
| 246 |
iso8601_SOURCES = test.iso8601.c |
| 247 |
iso8601_LDADD = $(COMMONLIBS) |
| 248 |
|
| 249 |
attrd_SOURCES = attrd.c |
| 250 |
-attrd_LDADD = $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la |
| 251 |
+attrd_LDADD = $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS) |
| 252 |
|
| 253 |
#pingd_SOURCES = pingd.c |
| 254 |
#pingd_LDADD = $(COMMONLIBS) |
| 255 |
@@ -123,14 +123,14 @@ |
| 256 |
|
| 257 |
if BUILD_SERVICELOG |
| 258 |
notifyServicelogEvent_SOURCES = notifyServicelogEvent.c |
| 259 |
-notifyServicelogEvent_CFLAGS = `pkg-config --cflags servicelog-1` |
| 260 |
-notifyServicelogEvent_LDFLAGS = `pkg-config --libs servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la |
| 261 |
+notifyServicelogEvent_CFLAGS = $(SERVICELOG_CFLAGS) |
| 262 |
+notifyServicelogEvent_LDADD = $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS) |
| 263 |
endif |
| 264 |
|
| 265 |
if BUILD_OPENIPMI_SERVICELOG |
| 266 |
ipmiservicelogd_SOURCES = ipmiservicelogd.c |
| 267 |
-ipmiservicelogd_CFLAGS = `pkg-config --cflags OpenIPMI OpenIPMIposix servicelog-1` |
| 268 |
-ipmiservicelogd_LDFLAGS = `pkg-config --libs OpenIPMI OpenIPMIposix servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la |
| 269 |
+ipmiservicelogd_CFLAGS = $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS) |
| 270 |
+ipmiservicelogd_LDFLAGS = $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS) |
| 271 |
endif |
| 272 |
|
| 273 |
%.8: % crm_attribute |
| 274 |
--- a/extra/Makefile.am |
| 275 |
+++ b/extra/Makefile.am |
| 276 |
@@ -20,5 +20,5 @@ |
| 277 |
|
| 278 |
SUBDIRS = resources |
| 279 |
|
| 280 |
-mibdir = $(datadir)/snmp/mibs |
| 281 |
+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs |
| 282 |
mib_DATA = PCMK-MIB.txt |
| 283 |
--- a/lib/pengine/Makefile.am |
| 284 |
+++ b/lib/pengine/Makefile.am |
| 285 |
@@ -34,7 +34,7 @@ |
| 286 |
|
| 287 |
libpe_status_la_LDFLAGS = -version-info 3:0:0 |
| 288 |
libpe_status_la_SOURCES = $(rule_files) $(status_files) |
| 289 |
-libpe_status_la_LIBADD = -llrm @CURSESLIBS@ |
| 290 |
+libpe_status_la_LIBADD = $(top_builddir)/lib/cib/libcib.la -llrm @CURSESLIBS@ |
| 291 |
|
| 292 |
clean-generic: |
| 293 |
rm -f *.log *.debug *~ |
| 294 |
--- a/lib/Makefile.am |
| 295 |
+++ b/lib/Makefile.am |
| 296 |
@@ -18,7 +18,7 @@ |
| 297 |
MAINTAINERCLEANFILES = Makefile.in |
| 298 |
|
| 299 |
## Subdirectories... |
| 300 |
-SUBDIRS = common pengine transition cib fencing plugins |
| 301 |
+SUBDIRS = common cib pengine transition fencing plugins |
| 302 |
DIST_SUBDIRS = $(SUBDIRS) ais |
| 303 |
|
| 304 |
if BUILD_CS_SUPPORT |
| 305 |
|
| 306 |
|
| 307 |
|
| 308 |
1.1 sys-cluster/pacemaker/files/pacemaker.service |
| 309 |
|
| 310 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.service?rev=1.1&view=markup |
| 311 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.service?rev=1.1&content-type=text/plain |
| 312 |
|
| 313 |
Index: pacemaker.service |
| 314 |
=================================================================== |
| 315 |
service { |
| 316 |
# Load the Pacemaker Cluster Resource Manager |
| 317 |
name: pacemaker |
| 318 |
ver: 1 |
| 319 |
} |
| 320 |
|
| 321 |
|
| 322 |
1.1 sys-cluster/pacemaker/files/pacemaker.initd |
| 323 |
|
| 324 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.initd?rev=1.1&view=markup |
| 325 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.initd?rev=1.1&content-type=text/plain |
| 326 |
|
| 327 |
Index: pacemaker.initd |
| 328 |
=================================================================== |
| 329 |
#!/sbin/runscript |
| 330 |
# Copyright 1999-2011 Gentoo Foundation |
| 331 |
# Distributed under the terms of the GNU General Public License v2 |
| 332 |
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/files/pacemaker.initd,v 1.1 2011/02/21 14:39:28 ultrabug Exp $ |
| 333 |
|
| 334 |
PIDFILE=/var/run/pacemaker.pid |
| 335 |
|
| 336 |
depend() { |
| 337 |
need net corosync |
| 338 |
use syslog |
| 339 |
} |
| 340 |
|
| 341 |
start() { |
| 342 |
nc=0 |
| 343 |
ebegin "Starting Pacemaker Cluster Manager" |
| 344 |
einfon "Waiting for Corosync startup ." |
| 345 |
while true; do |
| 346 |
/usr/sbin/corosync-cfgtool -s &>/dev/null && break |
| 347 |
nc=$(expr $nc + 1) |
| 348 |
if [ $nc -gt 30 ]; then |
| 349 |
echo |
| 350 |
eend 1 "Failed to detect Corosync startup, is it really running ?" |
| 351 |
exit 1 |
| 352 |
fi |
| 353 |
sleep 1 |
| 354 |
echo -n "." |
| 355 |
done |
| 356 |
echo |
| 357 |
start-stop-daemon --start -q --exec /usr/sbin/pacemakerd \ |
| 358 |
--pidfile "${PIDFILE}" --make-pidfile --background \ |
| 359 |
-- -f |
| 360 |
eend $? |
| 361 |
} |
| 362 |
|
| 363 |
stop() { |
| 364 |
ebegin "Stopping Pacemaker Cluster Manager" |
| 365 |
start-stop-daemon --stop -q --pidfile "${PIDFILE}" |
| 366 |
eend $? |
| 367 |
} |
Archives