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: crm by alan from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: lib by alan from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: linux-ha by alan from (linux-ha-cvs@lists.linux-ha.org) 4. Linux-HA CVS: linux-ha by alan from (linux-ha-cvs@lists.linux-ha.org) 5. Linux-HA CVS: resources by alan from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Fri, 9 Jun 2006 14:26:05 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: crm by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Project : linux-ha Module : crm Dir : linux-ha/crm/pengine Modified Files: Makefile.am Log Message: Put some missing header files into a couple of makefiles. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- Makefile.am 8 Jun 2006 13:39:10 -0000 1.35 +++ Makefile.am 9 Jun 2006 20:26:04 -0000 1.36 @@ -56,7 +56,7 @@ halib_PROGRAMS = ptest pengine ## SOURCES -noinst_HEADERS = allocate.h utils.h +noinst_HEADERS = allocate.h utils.h pengine.h #utils.h pengine.h libpengine_la_LDFLAGS = -version-info 3:0:0 ------------------------------ Message: 2 Date: Fri, 9 Jun 2006 14:26:04 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Project : linux-ha Module : lib Dir : linux-ha/lib/crm/pengine Modified Files: Makefile.am Log Message: Put some missing header files into a couple of makefiles. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 8 Jun 2006 13:39:10 -0000 1.4 +++ Makefile.am 9 Jun 2006 20:26:04 -0000 1.5 @@ -50,7 +50,7 @@ lib_LTLIBRARIES = libpe_rules.la libpe_status.la ## SOURCES -noinst_HEADERS = unpack.h +noinst_HEADERS = unpack.h utils.h pengine.h rule_files = rules.c common.c status_files = status.c unpack.c utils.c complex.c native.c group.c clone.c ------------------------------ Message: 3 Date: Fri, 9 Jun 2006 16:18:42 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Module : linux-ha Dir : linux-ha Modified Files: heartbeat.spec.in Log Message: Put in RPM rules for Andrew's missing libraries. Also enabled errors on missing things... =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v retrieving revision 1.175 retrieving revision 1.176 diff -u -3 -r1.175 -r1.176 --- heartbeat.spec.in 9 Jun 2006 18:59:52 -0000 1.175 +++ heartbeat.spec.in 9 Jun 2006 22:18:42 -0000 1.176 @@ -1,7 +1,7 @@ -# $Id: heartbeat.spec.in,v 1.175 2006/06/09 18:59:52 alan Exp $ +# $Id: heartbeat.spec.in,v 1.176 2006/06/09 22:18:42 alan Exp $ -# Workaround for a change in RPM 4.1.x; needs proper fixing soon! -##%define _unpackaged_files_terminate_build 0 +%define _unpackaged_files_terminate_build 1 +%define _missing_doc_files_terminate_build 1 Summary: @HB_PKG@ - The Heartbeat Subsystem for High-Availability Linux Name: @HB_PKG@ @@ -1198,6 +1198,8 @@ @libdir@/libplumbgpl.* @libdir@/librecoverymgr.* @libdir@/libstonithd.* [EMAIL PROTECTED]@/libpe_rules.* [EMAIL PROTECTED]@/libpe_status.* /usr/lib/ocf @base_includedir@/heartbeat @base_includedir@/clplumbing ------------------------------ Message: 4 Date: Sat, 10 Jun 2006 11:04:33 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Module : linux-ha Dir : linux-ha Modified Files: configure.in Log Message: Put in some code to detect missing directories, and also to drop a trailing "64" from libdir and libexecdir if the directory doesn't exist. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v retrieving revision 1.528 retrieving revision 1.529 diff -u -3 -r1.528 -r1.529 --- configure.in 7 Jun 2006 12:46:55 -0000 1.528 +++ configure.in 10 Jun 2006 17:04:32 -0000 1.529 @@ -10,7 +10,7 @@ AC_INIT(heartbeat.spec.in) AC_CONFIG_AUX_DIR(.) -AC_REVISION($Revision: 1.528 $) dnl cvs revision +AC_REVISION($Revision: 1.529 $) dnl cvs revision AC_CANONICAL_HOST @@ -195,6 +195,36 @@ libdir=`var "$libdir" "$exec_prefix/lib"` libexecdir=`var "$libexecdir" "$exec_prefix/libexec"` +for var in libdir libexecdir +do + dir=`eval echo '${'${var}'}'` + case $dir in + *64) if + test ! -d "$dir" + then + newdir=`echo "$dir" | sed 's%64$%%'` + if + test -d "$newdir" + then + eval $var="$newdir" + AC_MSG_WARN([$var value now set to $newdir since $dir doesn't exist]) + fi + fi;; + esac +done + +for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \ + includedir oldincludedir mandir docdir libdir +do + dirname=`eval echo '${'${j}'}'` + if + test ! -d "$dirname" + then + AC_MSG_ERROR([$j directory ($dirname) does not exist!]) + fi +done + + dnl The GNU conventions for installation directories don't always dnl sit well with this software. In particular, GNU's stated: dnl ------------------------------ Message: 5 Date: Sat, 10 Jun 2006 11:33:31 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: resources by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Project : linux-ha Module : resources Dir : linux-ha/resources/heartbeat Modified Files: IPaddr.in IPaddr2.in Log Message: Fixed a stupid error I put in, plus made some unnecessary messages go away... =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/IPaddr.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- IPaddr.in 15 Dec 2005 11:23:49 -0000 1.18 +++ IPaddr.in 10 Jun 2006 17:33:30 -0000 1.19 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: IPaddr.in,v 1.18 2005/12/15 11:23:49 xunsun Exp $ +# $Id: IPaddr.in,v 1.19 2006/06/10 17:33:30 alan Exp $ # # Description: wrapper of OCF RA IPaddr, based on original heartbeat RA. # See OCF RA IPaddr for more information. @@ -34,7 +34,7 @@ usage() { echo $USAGE >&2 - echo "$Id: IPaddr.in,v 1.18 2005/12/15 11:23:49 xunsun Exp $" + echo "$Id: IPaddr.in,v 1.19 2006/06/10 17:33:30 alan Exp $" } # @@ -132,4 +132,4 @@ ;; esac -ra_execocf "rsc_id=IPaddr_$BASEIP" "rsc_type=IPaddr" "provider=heartbeat" $2 "ip=$BASEIP" "broadcast=$BROADCAST" "nic=$NIC" "netmask=$NETMASK" +ra_execocf "rsc_id=IPaddr_$BASEIP" "rsc_type=IPaddr" "provider=heartbeat" $2 "ip=$BASEIP" "broadcast=$BROADCAST" "nic=$NIC" "cidr_netmask=$NETMASK" =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/IPaddr2.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- IPaddr2.in 14 Dec 2005 15:39:38 -0000 1.11 +++ IPaddr2.in 10 Jun 2006 17:33:30 -0000 1.12 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: IPaddr2.in,v 1.11 2005/12/14 15:39:38 xunsun Exp $ +# $Id: IPaddr2.in,v 1.12 2006/06/10 17:33:30 alan Exp $ # # Description: wrapper of OCF RA IPaddr2, based on original heartbeat RA. # See OCF RA IPaddr2 for more information. @@ -73,4 +73,4 @@ ;; esac -ra_execocf "rsc_id=IPaddr2_$BASEIP" "rsc_type=IPaddr2" "provider=heartbeat" $2 "ip=$BASEIP" "broadcast=$BROADCAST" "nic=$NIC" "netmask=$NETMASK" +ra_execocf "rsc_id=IPaddr2_$BASEIP" "rsc_type=IPaddr2" "provider=heartbeat" $2 "ip=$BASEIP" "broadcast=$BROADCAST" "nic=$NIC" "cidr_netmask=$NETMASK" ------------------------------ _______________________________________________ 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 31, Issue 33 ********************************************