Send Linux-ha-cvs mailing list submissions to linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs or, via email, send a message with subject or body 'help' to [EMAIL PROTECTED] You can reach the person managing the list at [EMAIL PROTECTED] When replying, please edit your Subject line so it is more specific than "Re: Contents of Linux-ha-cvs digest..." Today's Topics: 1. Linux-HA CVS: linux-ha by panjiam from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: mgmt by zhenh from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: debian by horms from (linux-ha-cvs@lists.linux-ha.org) 4. Linux-HA CVS: debian by horms from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Wed, 16 Aug 2006 21:15:42 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by panjiam from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : panjiam Host : Module : linux-ha Dir : linux-ha Modified Files: configure.in Makefile.am Log Message: added options for TSA plugin =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v retrieving revision 1.549 retrieving revision 1.550 diff -u -3 -r1.549 -r1.550 --- configure.in 17 Aug 2006 02:57:45 -0000 1.549 +++ configure.in 17 Aug 2006 03:15:41 -0000 1.550 @@ -10,7 +10,7 @@ AC_INIT(heartbeat.spec.in) AC_CONFIG_AUX_DIR(.) -AC_REVISION($Revision: 1.549 $) dnl cvs revision +AC_REVISION($Revision: 1.550 $) dnl cvs revision AC_CANONICAL_HOST @@ -2436,6 +2436,37 @@ AC_MSG_NOTICE([whether to enable the management tool... ${enable_mgmt}]) +dnl ********************************************** +dnl TSA plugin configuration +dnl ********************************************** +AC_ARG_ENABLE([tsa-plugin], +[ --enable-tsa-plugin Enable TSA plugin. [default=no]], + [], [enable_tsa_plugin=no]) +AC_ARG_WITH([JAVA_HOME], + [ --with-java-home JAVA_HOME dir], [], []) + +AC_ARG_WITH([TSA_DIR], + [ --with-tsa-dir TSA diretory, default = /opt/IBM/tsamp/], [], []) + +JAVA_HOME=${with_java_home} +TSA_DIR=${with_tsa_dir} + +if test "x${enable_tsa_plugin}" != "xno"; then + if test "x${JAVA_HOME}" = "x"; then + JAVA_BIN=`which java` + JAVA_BIN_DIR=`dirname ${JAVA_BIN}` + JAVA_HOME=`dirname ${JAVA_BIN_DIR}` + fi + + if test "x${TSA_DIR}" = "x"; then + TSA_DIR="/opt/IBM/tsamp/" + fi +fi + +AC_SUBST(JAVA_HOME) +AC_SUBST(TSA_DIR) +AM_CONDITIONAL(TSA_PLUGIN_BUILD, test "x${enable_tsa_plugin}" != "xno") + hb_libdir="${libdir}/${HB_PKG}" AC_SUBST(hb_libdir) @@ -2778,6 +2809,7 @@ cim/mof/Makefile \ cim/mof/register_providers.sh \ cim/mof/unregister_providers.sh \ +tsa_plugin/Makefile \ telecom/Makefile \ telecom/apphbd/Makefile \ telecom/recoverymgrd/Makefile \ @@ -2905,6 +2937,13 @@ AC_MSG_RESULT([ CIM providers dir = "${CMPI_PROVIDER_DIR}"]) AC_MSG_RESULT([ CMPI header files = "${CMPI_HEADER_PATH}"]) fi + +AC_MSG_RESULT([ Build TSA plugin = "${enable_tsa_plugin}"]) +if test "x${enable_tsa_plugin}" != "xno"; then +AC_MSG_RESULT([ JAVA_HOME = "${JAVA_HOME}"]) +AC_MSG_RESULT([ TSA_DIR = "${TSA_DIR}"]) +fi + AC_MSG_RESULT([ Enable times kludge = "${enable_times_kludge}"]) AC_SUBST(DISABLE_TIMES_KLUDGE) =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/Makefile.am,v retrieving revision 1.72 retrieving revision 1.73 diff -u -3 -r1.72 -r1.73 --- Makefile.am 24 Oct 2005 18:27:46 -0000 1.72 +++ Makefile.am 17 Aug 2006 03:15:41 -0000 1.73 @@ -65,6 +65,10 @@ CIM_PROVIDER_DIR = cim endif +if TSA_PLUGIN_BUILD +TSA_PLUGIN_DIR = tsa_plugin +endif + if LDIRECTORD_BUILD LDIRECTORD_DIR = ldirectord endif @@ -72,7 +76,7 @@ SUBDIRS = $(LIBLTDL_DIR) debian pkg port replace include lib \ heartbeat membership telecom linux-ha contrib resources lrm crm \ fencing logd $(SNMP_SUBAGENT_DIR) tools doc cts $(MGMT_DIR) \ - $(CIM_PROVIDER_DIR) $(LDIRECTORD_DIR) config + $(CIM_PROVIDER_DIR) $(LDIRECTORD_DIR) config $(TSA_PLUGIN_DIR) HANDY_DOCS = doc/ChangeLog doc/GettingStarted.html doc/DirectoryMap.txt HBDOCS = doc/heartbeat_api.html ------------------------------ Message: 2 Date: Wed, 16 Aug 2006 23:11:52 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : zhenh Host : Project : linux-ha Module : mgmt Dir : linux-ha/mgmt/daemon Modified Files: mgmt_crm.c Log Message: fix a unmatch quotation mark =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -3 -r1.66 -r1.67 --- mgmt_crm.c 16 Aug 2006 07:13:37 -0000 1.66 +++ mgmt_crm.c 17 Aug 2006 05:11:50 -0000 1.67 @@ -763,7 +763,7 @@ } snprintf(xml, MAX_STRLEN, - "<node id=\"%s\"><instance_attributes id=\"nodes-\"%s\">" + "<node id=\"%s\"><instance_attributes id=\"nodes-%s\">" "<attributes><nvpair id=\"standby-%s\" name=\"standby\" value=\"%s\"/>" "</attributes></instance_attributes></node>", id, id, id, argv[2]); ------------------------------ Message: 3 Date: Thu, 17 Aug 2006 00:03:08 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : horms Host : Project : linux-ha Module : debian Dir : linux-ha/debian Modified Files: Makefile.am Log Message: Fix up debian/Makefile.am so make dist works This catches up with some recent changes in the debian/patches directory Signed-Off-By: Simon Horman <[EMAIL PROTECTED]> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/debian/Makefile.am,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- Makefile.am 3 Feb 2006 01:15:16 -0000 1.22 +++ Makefile.am 17 Aug 2006 06:03:07 -0000 1.23 @@ -28,8 +28,8 @@ heartbeat-2-dev.dirs heartbeat-2-dev.files \ ldirectord-2.files ldirectord-2.postinst \ ldirectord-2.postrm \ - patches/02-chown-check.patch \ - patches/series/2.0.3-1 + patches/chown-check-2.patch \ + patches/series/2.0.8-1 clean-local: ------------------------------ Message: 4 Date: Thu, 17 Aug 2006 00:06:38 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : horms Host : Project : linux-ha Module : debian Dir : linux-ha/debian Modified Files: Tag: STABLE_1_2 Makefile.am Log Message: Fix up debian/Makefile.am so make dist works This catches up with some recent changes in the debian/patches directory Signed-Off-By: Simon Horman <[EMAIL PROTECTED]> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/debian/Makefile.am,v retrieving revision 1.6.2.16 retrieving revision 1.6.2.17 diff -u -3 -r1.6.2.16 -r1.6.2.17 --- Makefile.am 17 Aug 2005 09:10:17 -0000 1.6.2.16 +++ Makefile.am 17 Aug 2006 06:06:38 -0000 1.6.2.17 @@ -34,7 +34,7 @@ libstonith0.postinst \ stonith.files \ patches/00-ssh_scp_path.patch \ - patches/series/1.2.4-1 + patches/series/1.2.6-1 clean-local: rm -f *.substvars *.debhelper files ------------------------------ _______________________________________________ Linux-ha-cvs mailing list Linux-ha-cvs@lists.linux-ha.org http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs End of Linux-ha-cvs Digest, Vol 33, Issue 75 ********************************************