From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 22 Aug 2007 08:59:06 -0000 Subject: [Cluster-devel] cluster ./configure ccs/ccs_test/Makefile ccs/ ... Message-ID: <20070822085906.21588.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: fabbione at sourceware.org 2007-08-22 08:58:48 Modified files: . : configure ccs/ccs_test : Makefile ccs_test.c ccs/ccs_tool : Makefile ccs_tool.c ccs/common : log.h ccs/daemon : Makefile ccsd.c cman/cman_tool : Makefile main.c cman/daemon : Makefile daemon.c fence/agents/apc: Makefile fence_apc.pl fence_apc.py fence_apc_snmp.py fence/agents/baytech: Makefile fence_baytech.pl fence/agents/bladecenter: Makefile fence_bladecenter.pl fence/agents/brocade: Makefile fence_brocade.pl fence/agents/bullpap: Makefile fence_bullpap.pl fence/agents/cpint: Makefile fence_cpint.pl fence/agents/drac: Makefile fence_drac.pl fence/agents/egenera: Makefile fence_egenera.pl fence/agents/ibmblade: Makefile fence_ibmblade.pl fence/agents/ilo: Makefile fence_ilo.pl fence/agents/ipmilan: Makefile ipmilan.c fence/agents/mcdata: Makefile fence_mcdata.pl fence/agents/rackswitch: Makefile do_rack.c fence/agents/rps10: Makefile rps10.c fence/agents/rsa: Makefile fence_rsa.py fence/agents/rsb: Makefile fence_rsb.py fence/agents/sanbox2: Makefile fence_sanbox2.pl fence/agents/scsi: Makefile fence_scsi.pl fence_scsi_test.pl fence/agents/vixel: Makefile fence_vixel.pl fence/agents/vmware: Makefile fence_vmware.pl fence/agents/wti: Makefile fence_wti.pl fence/agents/xcat: Makefile fence_xcat.pl fence/agents/xen: Makefile fence_xen.pl fence/agents/xvm: Makefile fence_xvm.c fence_xvmd.c fence/agents/zvm: Makefile fence_zvm.pl fence/fence_node: Makefile fence_node.c fence/fence_tool: Makefile fence_tool.c fence/fenced : Makefile main.c gfs/gfs_debug : Makefile main.c gfs/gfs_edit : Makefile hexedit.c gfs/gfs_fsck : Makefile main.c gfs/gfs_grow : Makefile main.c gfs/gfs_jadd : Makefile main.c gfs/gfs_mkfs : Makefile main.c gfs/gfs_quota : Makefile main.c gfs/gfs_tool : Makefile main.c gfs/libgfs : Makefile gfs-kernel/src/gfs: gfs.h main.c gfs2/convert : Makefile gfs2_convert.c gfs2/debug : Makefile main.c gfs2/edit : Makefile hexedit.c gfs2/fsck : Makefile main.c gfs2/libgfs2 : Makefile gfs2/mkfs : Makefile main_grow.c main_jadd.c main_mkfs.c gfs2/mount : Makefile mount.gfs2.c umount.gfs2.c gfs2/quota : Makefile main.c gfs2/tool : Makefile main.c gnbd/client : Makefile gnbd_recvd.c gnbd/server : Makefile gnbd_serv.c gnbd/tools/fence_gnbd: Makefile main.c gnbd/tools/gnbd_export: Makefile gnbd_export.c gnbd/tools/gnbd_import: Makefile gnbd_import.c rgmanager/src/clulib: Makefile rgmanager/src/utils: Makefile clustat.c clusvcadm.c Log message: Cleanup FOO_RELEASE_NAME to RELEASE_VERSION Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.25&r2=1.26 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/ccs_test.c.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/ccs_tool.c.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/common/log.h.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/ccsd.c.diff?cvsroot=cluster&r1=1.27&r2=1.28 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/main.c.diff?cvsroot=cluster&r1=1.54&r2=1.55 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.53&r2=1.54 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/daemon.c.diff?cvsroot=cluster&r1=1.35&r2=1.36 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/fence_apc.pl.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/fence_apc.py.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/fence_apc_snmp.py.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/baytech/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/baytech/fence_baytech.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bladecenter/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bladecenter/fence_bladecenter.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/brocade/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/brocade/fence_brocade.pl.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bullpap/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bullpap/fence_bullpap.pl.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/cpint/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/cpint/fence_cpint.pl.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/fence_drac.pl.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/egenera/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/egenera/fence_egenera.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ibmblade/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ibmblade/fence_ibmblade.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ilo/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ilo/fence_ilo.pl.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/ipmilan.c.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/mcdata/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/mcdata/fence_mcdata.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/do_rack.c.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/rps10.c.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsa/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsa/fence_rsa.py.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsb/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsb/fence_rsb.py.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/sanbox2/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/sanbox2/fence_sanbox2.pl.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/fence_scsi.pl.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/fence_scsi_test.pl.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vixel/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vixel/fence_vixel.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vmware/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vmware/fence_vmware.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/wti/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/wti/fence_wti.pl.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xcat/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xcat/fence_xcat.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xen/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xen/fence_xen.pl.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvm.c.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvmd.c.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/zvm/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/zvm/fence_zvm.pl.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/fence_node.c.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/fence_tool.c.diff?cvsroot=cluster&r1=1.25&r2=1.26 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/main.c.diff?cvsroot=cluster&r1=1.42&r2=1.43 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/main.c.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/hexedit.c.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/main.c.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/main.c.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/main.c.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/main.c.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/main.c.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/main.c.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/gfs.h.diff?cvsroot=cluster&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/main.c.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/gfs2_convert.c.diff?cvsroot=cluster&r1=1.11&r2=1.12 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/debug/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/debug/main.c.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/hexedit.c.diff?cvsroot=cluster&r1=1.18&r2=1.19 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/main.c.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_grow.c.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_jadd.c.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_mkfs.c.diff?cvsroot=cluster&r1=1.16&r2=1.17 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/mount.gfs2.c.diff?cvsroot=cluster&r1=1.26&r2=1.27 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/umount.gfs2.c.diff?cvsroot=cluster&r1=1.14&r2=1.15 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/main.c.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/main.c.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/gnbd_recvd.c.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/gnbd_serv.c.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/main.c.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/gnbd_export.c.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/gnbd_import.c.diff?cvsroot=cluster&r1=1.19&r2=1.20 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&r1=1.33&r2=1.34 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clusvcadm.c.diff?cvsroot=cluster&r1=1.21&r2=1.22 --- cluster/configure 2007/06/06 08:42:12 1.25 +++ cluster/configure 2007/08/22 08:58:36 1.26 @@ -365,7 +365,8 @@ print OFILE "RELEASE_MAJOR = $release_major\n"; print OFILE "RELEASE_MINOR = $release_minor\n"; -print OFILE "RELEASE = $release_major.$release_minor\n"; +print OFILE "RELEASE_VERSION = $release_major.$release_minor\n"; +print OFILE "CFLAGS += -DRELEASE_VERSION=\\\"$release_major.$release_minor\\\"\n"; close OFILE; print "Completed Makefile configuration\n\n"; --- cluster/ccs/ccs_test/Makefile 2007/06/01 09:45:30 1.7 +++ cluster/ccs/ccs_test/Makefile 2007/08/22 08:58:36 1.8 @@ -16,7 +16,7 @@ OBJS= ccs_test.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -I${ccsincdir} CFLAGS += -I${incdir} --- cluster/ccs/ccs_test/ccs_test.c 2005/02/11 17:38:08 1.4 +++ cluster/ccs/ccs_test/ccs_test.c 2007/08/22 08:58:36 1.5 @@ -39,7 +39,7 @@ exit(EXIT_SUCCESS); } if(!strcmp(argv[i], "-V")){ - printf("%s %s (built %s %s)\n", argv[0], CCS_RELEASE_NAME, __DATE__, __TIME__); + printf("%s %s (built %s %s)\n", argv[0], RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); } --- cluster/ccs/ccs_tool/Makefile 2007/06/01 09:45:31 1.12 +++ cluster/ccs/ccs_tool/Makefile 2007/08/22 08:58:36 1.13 @@ -21,7 +21,6 @@ editconf.o CFLAGS += -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -CFLAGS += -DCCS_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -I${ccsincdir} -I${cmanincdir} `xml2-config --cflags` CFLAGS += -I../include CFLAGS += -I${incdir} --- cluster/ccs/ccs_tool/ccs_tool.c 2007/05/03 09:06:39 1.6 +++ cluster/ccs/ccs_tool/ccs_tool.c 2007/08/22 08:58:36 1.7 @@ -21,7 +21,7 @@ exit(EXIT_SUCCESS); } if (!strcmp(argv[optind], "-V")) { - printf("%s %s (built %s %s)\n", argv[0], CCS_RELEASE_NAME, + printf("%s %s (built %s %s)\n", argv[0], RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/ccs/common/log.h 2004/12/22 23:01:28 1.4 +++ cluster/ccs/common/log.h 2007/08/22 08:58:36 1.5 @@ -87,10 +87,10 @@ #define die(ext, fmt, args...) { \ if(log_is_open){ \ syslog(LOG_ERR, "In %s, at %d (%s) death by:\n" fmt , __FILE__ , \ - __LINE__ , CCS_RELEASE_NAME , ## args ); exit(ext); \ + __LINE__ , RELEASE_VERSION , ## args ); exit(ext); \ }else { \ fprintf(stderr, "In %s, at %d (%s) death by:\n" fmt , __FILE__ , \ - __LINE__ , CCS_RELEASE_NAME , ## args ); exit(ext); \ + __LINE__ , RELEASE_VERSION , ## args ); exit(ext); \ } \ } --- cluster/ccs/daemon/Makefile 2007/06/01 09:45:31 1.14 +++ cluster/ccs/daemon/Makefile 2007/08/22 08:58:36 1.15 @@ -20,7 +20,7 @@ misc.o \ globals.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -Wall CFLAGS += -I${cmanincdir} `xml2-config --cflags` CFLAGS += -I. -I../include -I../common --- cluster/ccs/daemon/ccsd.c 2006/10/20 14:18:00 1.27 +++ cluster/ccs/daemon/ccsd.c 2007/08/22 08:58:36 1.28 @@ -478,7 +478,7 @@ ttl = atoi(optarg); break; case 'V': - printf("%s %s (built %s %s)\n", argv[0], CCS_RELEASE_NAME, __DATE__, __TIME__); + printf("%s %s (built %s %s)\n", argv[0], RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); case 'X': @@ -784,7 +784,7 @@ */ static void print_start_msg(char *msg){ /* We want the start message to print every time */ - log_msg("Starting ccsd %s:\n", CCS_RELEASE_NAME); + log_msg("Starting ccsd %s:\n", RELEASE_VERSION); log_msg(" Built: "__DATE__" "__TIME__"\n"); log_msg(" %s\n", REDHAT_COPYRIGHT); if(msg){ --- cluster/cman/cman_tool/Makefile 2007/06/01 09:45:31 1.22 +++ cluster/cman/cman_tool/Makefile 2007/08/22 08:58:36 1.23 @@ -17,7 +17,6 @@ OBJS= main.o \ join.o -CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -DSBINDIR=\"${sbindir}\" CFLAGS += -I${ccsincdir} -I${cmanincdir} CFLAGS += -I${incdir} --- cluster/cman/cman_tool/main.c 2007/08/20 14:37:26 1.54 +++ cluster/cman/cman_tool/main.c 2007/08/22 08:58:36 1.55 @@ -690,7 +690,7 @@ case 'V': printf("cman_tool %s (built %s %s)\n", - CMAN_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); break; --- cluster/cman/daemon/Makefile 2007/06/13 08:28:45 1.53 +++ cluster/cman/daemon/Makefile 2007/08/22 08:58:37 1.54 @@ -12,7 +12,7 @@ include ../../make/defines.mk -CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\" -DOPENAIS_EXTERNAL_SERVICE +CFLAGS += -DOPENAIS_EXTERNAL_SERVICE CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${openaisincdir} CFLAGS += -I${incdir} --- cluster/cman/daemon/daemon.c 2007/06/19 12:32:19 1.35 +++ cluster/cman/daemon/daemon.c 2007/08/22 08:58:37 1.36 @@ -482,7 +482,7 @@ barrier_init(); log_msg(LOG_INFO, "CMAN %s (built %s %s) started\n", - CMAN_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); fd = open_local_sock(CLIENT_SOCKNAME, sizeof(CLIENT_SOCKNAME), 0660, ais_poll_handle, CON_CLIENT); if (fd < 0) --- cluster/fence/agents/apc/Makefile 2007/05/02 12:39:32 1.5 +++ cluster/fence/agents/apc/Makefile 2007/08/22 08:58:37 1.6 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).py : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET) - echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET) echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET) --- cluster/fence/agents/apc/fence_apc.pl 2006/08/16 18:58:40 1.10 +++ cluster/fence/agents/apc/fence_apc.pl 2007/08/22 08:58:37 1.11 @@ -47,7 +47,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -99,7 +99,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; } --- cluster/fence/agents/apc/fence_apc.py 2007/07/12 03:45:44 1.5 +++ cluster/fence/agents/apc/fence_apc.py 2007/08/22 08:58:37 1.6 @@ -25,7 +25,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -FENCE_RELEASE_NAME="New APC Agent - test release" +RELEASE_VERSION="New APC Agent - test release" REDHAT_COPYRIGHT="" BUILD_DATE="September 21, 2006" #END_VERSION_GENERATION @@ -101,7 +101,7 @@ sys.exit (0) def version(): - print "fence_apc %s %s\n" % (FENCE_RELEASE_NAME, BUILD_DATE) + print "fence_apc %s %s\n" % (RELEASE_VERSION, BUILD_DATE) print "%s\n" % REDHAT_COPYRIGHT sys.exit(0) --- cluster/fence/agents/apc/fence_apc_snmp.py 2007/02/14 09:37:10 1.3 +++ cluster/fence/agents/apc/fence_apc_snmp.py 2007/08/22 08:58:37 1.4 @@ -28,7 +28,7 @@ from glob import glob #BEGIN_VERSION_GENERATION -FENCE_RELEASE_NAME="" +RELEASE_VERSION="" REDHAT_COPYRIGHT="" BUILD_DATE="" #END_VERSION_GENERATION @@ -83,7 +83,7 @@ if o == "-v": verbose = True if o == "-V": - print "%s\n" % FENCE_RELEASE_NAME + print "%s\n" % RELEASE_VERSION print "%s\n" % REDHAT_COPYRIGHT print "%s\n" % BUILD_DATE sys.exit(0) --- cluster/fence/agents/baytech/Makefile 2007/05/02 12:39:32 1.3 +++ cluster/fence/agents/baytech/Makefile 2007/08/22 08:58:37 1.4 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/baytech/fence_baytech.pl 2007/02/12 20:17:05 1.3 +++ cluster/fence/agents/baytech/fence_baytech.pl 2007/08/22 08:58:37 1.4 @@ -31,7 +31,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -94,7 +94,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/bladecenter/Makefile 2007/05/02 12:39:32 1.5 +++ cluster/fence/agents/bladecenter/Makefile 2007/08/22 08:58:37 1.6 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/bladecenter/fence_bladecenter.pl 2007/02/12 20:17:05 1.3 +++ cluster/fence/agents/bladecenter/fence_bladecenter.pl 2007/08/22 08:58:37 1.4 @@ -34,7 +34,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -78,7 +78,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/brocade/Makefile 2007/05/02 12:39:32 1.4 +++ cluster/fence/agents/brocade/Makefile 2007/08/22 08:58:37 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/brocade/fence_brocade.pl 2007/02/12 20:17:06 1.4 +++ cluster/fence/agents/brocade/fence_brocade.pl 2007/08/22 08:58:38 1.5 @@ -27,7 +27,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -71,7 +71,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/bullpap/Makefile 2007/05/02 12:39:32 1.5 +++ cluster/fence/agents/bullpap/Makefile 2007/08/22 08:58:38 1.6 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/bullpap/fence_bullpap.pl 2007/02/12 20:17:06 1.7 +++ cluster/fence/agents/bullpap/fence_bullpap.pl 2007/08/22 08:58:38 1.8 @@ -30,7 +30,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -83,7 +83,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/cpint/Makefile 2007/05/02 12:39:32 1.3 +++ cluster/fence/agents/cpint/Makefile 2007/08/22 08:58:38 1.4 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/cpint/fence_cpint.pl 2007/02/12 20:17:06 1.2 +++ cluster/fence/agents/cpint/fence_cpint.pl 2007/08/22 08:58:38 1.3 @@ -26,7 +26,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -64,7 +64,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/drac/Makefile 2007/05/02 12:39:32 1.4 +++ cluster/fence/agents/drac/Makefile 2007/08/22 08:58:38 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/drac/fence_drac.pl 2007/02/12 20:17:06 1.10 +++ cluster/fence/agents/drac/fence_drac.pl 2007/08/22 08:58:38 1.11 @@ -58,7 +58,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -126,7 +126,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; } --- cluster/fence/agents/egenera/Makefile 2007/05/02 12:39:32 1.4 +++ cluster/fence/agents/egenera/Makefile 2007/08/22 08:58:38 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/egenera/fence_egenera.pl 2007/02/12 20:17:06 1.3 +++ cluster/fence/agents/egenera/fence_egenera.pl 2007/08/22 08:58:38 1.4 @@ -20,7 +20,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -69,7 +69,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/ibmblade/Makefile 2007/05/02 12:39:33 1.3 +++ cluster/fence/agents/ibmblade/Makefile 2007/08/22 08:58:39 1.4 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/ibmblade/fence_ibmblade.pl 2007/02/12 20:17:06 1.3 +++ cluster/fence/agents/ibmblade/fence_ibmblade.pl 2007/08/22 08:58:39 1.4 @@ -34,7 +34,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -77,7 +77,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; @@ -179,7 +179,7 @@ -timeout => $snmp_timeout); if (!defined ($snmpsess)) { - printf("$FENCE_RELEASE_NAME ERROR: %s.\n", $error); + printf("$RELEASE_VERSION ERROR: %s.\n", $error); exit 1; }; @@ -190,25 +190,25 @@ -varbindlist => [$oid] ); if (!defined($result)) { - printf("$FENCE_RELEASE_NAME ERROR: %s.\n", $snmpsess->error); + printf("$RELEASE_VERSION ERROR: %s.\n", $snmpsess->error); $snmpsess->close; exit 1; } if (defined ($opt_t)) { - printf ("$FENCE_RELEASE_NAME STATE: Port %d on %s returned %d\n", $opt_n, $opt_a, $result->{$oid}); + printf ("$RELEASE_VERSION STATE: Port %d on %s returned %d\n", $opt_n, $opt_a, $result->{$oid}); exit 1; }; if ($opt_o =~ /^(reboot|off)$/i) { if ($result->{$oid} == "0") { - printf ("$FENCE_RELEASE_NAME WARNING: Port %d on %s already down.\n", $opt_n, $opt_a); + printf ("$RELEASE_VERSION WARNING: Port %d on %s already down.\n", $opt_n, $opt_a); $snmpsess->close; exit 0; }; } else { if ($result->{$oid} == "1") { - printf ("$FENCE_RELEASE_NAME WARNING: Port %d on %s already up.\n", $opt_n, $opt_a); + printf ("$RELEASE_VERSION WARNING: Port %d on %s already up.\n", $opt_n, $opt_a); $snmpsess->close; exit 0; }; @@ -250,20 +250,20 @@ if (!defined($result)) { # this is a real error - printf("$FENCE_RELEASE_NAME ERROR: %s.\n", $snmpsess->error); + printf("$RELEASE_VERSION ERROR: %s.\n", $snmpsess->error); $snmpsess->close; exit 1; }; if ($opt_o =~ /^(off)$/i) { if ($result->{$oid} == "1") { - printf ("$FENCE_RELEASE_NAME ERROR: Port %d on %s still up.\n", $opt_n, $opt_a); + printf ("$RELEASE_VERSION ERROR: Port %d on %s still up.\n", $opt_n, $opt_a); $snmpsess->close; exit 1; }; } else { if ($result->{$oid} == "0") { - printf ("$FENCE_RELEASE_NAME ERROR: Port %d on %s still down.\n", $opt_n, $opt_a); + printf ("$RELEASE_VERSION ERROR: Port %d on %s still down.\n", $opt_n, $opt_a); $snmpsess->close; exit 1; }; @@ -272,6 +272,6 @@ # everything's a ok :) $snmpsess->close; -printf ("$FENCE_RELEASE_NAME SUCCESS: Port %d on %s changed state to %s\n", $opt_n, $opt_a, $opt_o) unless defined $opt_q; +printf ("$RELEASE_VERSION SUCCESS: Port %d on %s changed state to %s\n", $opt_n, $opt_a, $opt_o) unless defined $opt_q; exit 0; --- cluster/fence/agents/ilo/Makefile 2007/05/02 12:39:33 1.4 +++ cluster/fence/agents/ilo/Makefile 2007/08/22 08:58:39 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/ilo/fence_ilo.pl 2007/06/25 21:47:09 1.9 +++ cluster/fence/agents/ilo/fence_ilo.pl 2007/08/22 08:58:39 1.10 @@ -27,7 +27,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -78,7 +78,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; } --- cluster/fence/agents/ipmilan/Makefile 2007/06/01 09:45:32 1.6 +++ cluster/fence/agents/ipmilan/Makefile 2007/08/22 08:58:39 1.7 @@ -18,7 +18,7 @@ OBJS= expect.o \ ipmilan.o -CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\" -DFENCE +CFLAGS += -DFENCE CFLAGS += -I${incdir} all: ${TARGET} --- cluster/fence/agents/ipmilan/ipmilan.c 2007/06/26 19:52:52 1.12 +++ cluster/fence/agents/ipmilan/ipmilan.c 2007/08/22 08:58:39 1.13 @@ -59,7 +59,7 @@ #include #else #define REDHAT_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc.\n" -#define FENCE_RELEASE_NAME "TEST ONLY; Not for distribution\n" +#define RELEASE_VERSION "TEST ONLY; Not for distribution\n" #endif #endif @@ -1001,7 +1001,7 @@ break; case 'V': printf("%s %s (built %s %s)\n", pname, - FENCE_RELEASE_NAME, + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); --- cluster/fence/agents/mcdata/Makefile 2007/05/02 12:39:33 1.4 +++ cluster/fence/agents/mcdata/Makefile 2007/08/22 08:58:39 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/mcdata/fence_mcdata.pl 2007/02/12 20:17:06 1.3 +++ cluster/fence/agents/mcdata/fence_mcdata.pl 2007/08/22 08:58:39 1.4 @@ -34,7 +34,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -78,7 +78,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/rackswitch/Makefile 2007/06/01 09:45:32 1.5 +++ cluster/fence/agents/rackswitch/Makefile 2007/08/22 08:58:39 1.6 @@ -17,7 +17,6 @@ OBJS= do_rack.o -CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -I${incdir} all: ${TARGET} --- cluster/fence/agents/rackswitch/do_rack.c 2007/02/13 19:23:40 1.2 +++ cluster/fence/agents/rackswitch/do_rack.c 2007/08/22 08:58:40 1.3 @@ -219,7 +219,7 @@ break; case 'V': - printf("%s %s (built %s %s)\n", pname, FENCE_RELEASE_NAME, + printf("%s %s (built %s %s)\n", pname, RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(DID_SUCCESS); --- cluster/fence/agents/rps10/Makefile 2007/06/01 09:45:32 1.5 +++ cluster/fence/agents/rps10/Makefile 2007/08/22 08:58:40 1.6 @@ -17,7 +17,6 @@ OBJS= rps10.o -CFLAGS+= -DFENCE_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -I${incdir} all: ${TARGET} --- cluster/fence/agents/rps10/rps10.c 2007/02/13 19:23:40 1.3 +++ cluster/fence/agents/rps10/rps10.c 2007/08/22 08:58:40 1.4 @@ -426,7 +426,7 @@ break; case 'V': printf("%s %s (built %s %s)\n", pname, - FENCE_RELEASE_NAME, + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); --- cluster/fence/agents/rsa/Makefile 2007/05/02 12:39:33 1.5 +++ cluster/fence/agents/rsa/Makefile 2007/08/22 08:58:40 1.6 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).py : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET) - echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET) echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET) --- cluster/fence/agents/rsa/fence_rsa.py 2007/02/14 15:42:28 1.4 +++ cluster/fence/agents/rsa/fence_rsa.py 2007/08/22 08:58:40 1.5 @@ -26,7 +26,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -FENCE_RELEASE_NAME="" +RELEASE_VERSION="" REDHAT_COPYRIGHT="" BUILD_DATE="" #END_VERSION_GENERATION @@ -47,7 +47,7 @@ sys.exit (0) def version(): - print "fence_rsa %s %s\n" % (FENCE_RELEASE_NAME, BUILD_DATE) + print "fence_rsa %s %s\n" % (RELEASE_VERSION, BUILD_DATE) print "%s\n" % REDHAT_COPYRIGHT sys.exit(0) --- cluster/fence/agents/rsb/Makefile 2007/05/02 12:39:33 1.5 +++ cluster/fence/agents/rsb/Makefile 2007/08/22 08:58:40 1.6 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).py : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).py >> $(TARGET) - echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET) echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).py >> $(TARGET) --- cluster/fence/agents/rsb/fence_rsb.py 2007/02/14 15:42:28 1.2 +++ cluster/fence/agents/rsb/fence_rsb.py 2007/08/22 08:58:40 1.3 @@ -27,7 +27,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -FENCE_RELEASE_NAME="" +RELEASE_VERSION="" REDHAT_COPYRIGHT="" BUILD_DATE="" #END_VERSION_GENERATION @@ -49,7 +49,7 @@ sys.exit (0) def version(): - print "fence_rsb %s %s\n" % (FENCE_RELEASE_NAME, BUILD_DATE) + print "fence_rsb %s %s\n" % (RELEASE_VERSION, BUILD_DATE) print "%s\n" % REDHAT_COPYRIGHT sys.exit(0) --- cluster/fence/agents/sanbox2/Makefile 2007/05/02 12:39:34 1.4 +++ cluster/fence/agents/sanbox2/Makefile 2007/08/22 08:58:40 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/sanbox2/fence_sanbox2.pl 2007/02/12 20:17:06 1.4 +++ cluster/fence/agents/sanbox2/fence_sanbox2.pl 2007/08/22 08:58:40 1.5 @@ -27,7 +27,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -71,7 +71,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/scsi/Makefile 2007/05/02 12:39:34 1.12 +++ cluster/fence/agents/scsi/Makefile 2007/08/22 08:58:40 1.13 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) @@ -29,7 +29,7 @@ $(TARGET)_test: $(TARGET)_test.pl : > $(TARGET)_test awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET)_test.pl >> $(TARGET)_test - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)_test + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET)_test ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)_test echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)_test awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET)_test.pl >> $(TARGET)_test --- cluster/fence/agents/scsi/fence_scsi.pl 2006/07/12 20:34:17 1.5 +++ cluster/fence/agents/scsi/fence_scsi.pl 2007/08/22 08:58:40 1.6 @@ -15,7 +15,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -37,7 +37,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/scsi/fence_scsi_test.pl 2007/03/06 19:07:24 1.2 +++ cluster/fence/agents/scsi/fence_scsi_test.pl 2007/08/22 08:58:40 1.3 @@ -12,7 +12,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION --- cluster/fence/agents/vixel/Makefile 2007/05/02 12:39:34 1.4 +++ cluster/fence/agents/vixel/Makefile 2007/08/22 08:58:41 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/vixel/fence_vixel.pl 2007/02/12 20:17:07 1.3 +++ cluster/fence/agents/vixel/fence_vixel.pl 2007/08/22 08:58:41 1.4 @@ -25,7 +25,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -64,7 +64,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/vmware/Makefile 2007/05/02 12:39:34 1.3 +++ cluster/fence/agents/vmware/Makefile 2007/08/22 08:58:41 1.4 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/vmware/fence_vmware.pl 2007/04/03 18:24:36 1.3 +++ cluster/fence/agents/vmware/fence_vmware.pl 2007/08/22 08:58:41 1.4 @@ -99,7 +99,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; } --- cluster/fence/agents/wti/Makefile 2007/05/02 12:39:34 1.4 +++ cluster/fence/agents/wti/Makefile 2007/08/22 08:58:41 1.5 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/wti/fence_wti.pl 2007/02/12 20:17:08 1.7 +++ cluster/fence/agents/wti/fence_wti.pl 2007/08/22 08:58:41 1.8 @@ -26,7 +26,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -70,7 +70,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/xcat/Makefile 2007/05/02 12:39:34 1.3 +++ cluster/fence/agents/xcat/Makefile 2007/08/22 08:58:41 1.4 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/xcat/fence_xcat.pl 2007/02/12 20:17:08 1.3 +++ cluster/fence/agents/xcat/fence_xcat.pl 2007/08/22 08:58:41 1.4 @@ -23,7 +23,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -64,7 +64,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/agents/xen/Makefile 2007/05/02 12:39:34 1.3 +++ cluster/fence/agents/xen/Makefile 2007/08/22 08:58:41 1.4 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/xen/fence_xen.pl 2007/02/12 20:17:08 1.3 +++ cluster/fence/agents/xen/fence_xen.pl 2007/08/22 08:58:41 1.4 @@ -35,7 +35,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -82,7 +82,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; } --- cluster/fence/agents/xvm/Makefile 2007/07/05 14:27:27 1.12 +++ cluster/fence/agents/xvm/Makefile 2007/08/22 08:58:41 1.13 @@ -33,7 +33,7 @@ options.o \ debug.o -CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\" -D_GNU_SOURCE +CFLAGS += -D_GNU_SOURCE CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -ggdb CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir} CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir} --- cluster/fence/agents/xvm/fence_xvm.c 2007/03/06 15:32:49 1.5 +++ cluster/fence/agents/xvm/fence_xvm.c 2007/08/22 08:58:41 1.6 @@ -333,8 +333,8 @@ if (args.flags & F_VERSION) { printf("%s %s\n", basename(argv[0]), XVM_VERSION); -#ifdef FENCE_RELEASE_NAME - printf("fence release %s\n", FENCE_RELEASE_NAME); +#ifdef RELEASE_VERSION + printf("fence release %s\n", RELEASE_VERSION); #endif exit(0); } --- cluster/fence/agents/xvm/fence_xvmd.c 2007/06/26 17:23:41 1.9 +++ cluster/fence/agents/xvm/fence_xvmd.c 2007/08/22 08:58:41 1.10 @@ -700,8 +700,8 @@ if (args.flags & F_VERSION) { printf("%s %s\n", basename(argv[0]), XVM_VERSION); -#ifdef FENCE_RELEASE_NAME - printf("fence release %s\n", FENCE_RELEASE_NAME); +#ifdef RELEASE_VERSION + printf("fence release %s\n", RELEASE_VERSION); #endif exit(0); } --- cluster/fence/agents/zvm/Makefile 2007/05/02 12:39:34 1.3 +++ cluster/fence/agents/zvm/Makefile 2007/08/22 08:58:41 1.4 @@ -20,7 +20,7 @@ $(TARGET): $(TARGET).pl : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(TARGET).pl >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + echo "\$$RELEASE_VERSION=\"${RELEASE_VERSION}\";" >> $(TARGET) ${DEF2VAR} ${BUILDDIR}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(TARGET).pl >> $(TARGET) --- cluster/fence/agents/zvm/fence_zvm.pl 2007/02/12 20:17:08 1.2 +++ cluster/fence/agents/zvm/fence_zvm.pl 2007/08/22 08:58:41 1.3 @@ -25,7 +25,7 @@ # "#END_VERSION_GENERATION" It is generated by the Makefile #BEGIN_VERSION_GENERATION -$FENCE_RELEASE_NAME=""; +$RELEASE_VERSION=""; $REDHAT_COPYRIGHT=""; $BUILD_DATE=""; #END_VERSION_GENERATION @@ -71,7 +71,7 @@ sub version { - print "$pname $FENCE_RELEASE_NAME $BUILD_DATE\n"; + print "$pname $RELEASE_VERSION $BUILD_DATE\n"; print "$REDHAT_COPYRIGHT\n" if ( $REDHAT_COPYRIGHT ); exit 0; --- cluster/fence/fence_node/Makefile 2007/06/01 09:45:32 1.8 +++ cluster/fence/fence_node/Makefile 2007/08/22 08:58:42 1.9 @@ -18,7 +18,7 @@ OBJS= ../fenced/agent.o \ fence_node.o -CFLAGS += -g -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -g -D_FILE_OFFSET_BITS=64 ifeq ($(DEBUG),y) CFLAGS += -O0 -DDEBUG -g --- cluster/fence/fence_node/fence_node.c 2007/02/22 16:12:41 1.8 +++ cluster/fence/fence_node/fence_node.c 2007/08/22 08:58:42 1.9 @@ -73,7 +73,7 @@ case 'V': printf("%s %s (built %s %s)\n", prog_name, - FENCE_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); break; --- cluster/fence/fence_tool/Makefile 2007/06/01 09:45:32 1.15 +++ cluster/fence/fence_tool/Makefile 2007/08/22 08:58:42 1.16 @@ -18,7 +18,7 @@ OBJS= ../fenced/agent.o \ fence_tool.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -I${ccsincdir} -I${cmanincdir} CFLAGS += -I../include -I../../group/lib CFLAGS += -I${incdir} --- cluster/fence/fence_tool/fence_tool.c 2007/08/15 20:57:28 1.25 +++ cluster/fence/fence_tool/fence_tool.c 2007/08/22 08:58:42 1.26 @@ -381,7 +381,7 @@ case 'V': printf("fence_tool %s (built %s %s)\n", - FENCE_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); break; --- cluster/fence/fenced/Makefile 2007/06/01 09:45:32 1.10 +++ cluster/fence/fenced/Makefile 2007/08/22 08:58:42 1.11 @@ -21,7 +21,7 @@ member_cman.o \ agent.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -g CFLAGS += -I${ccsincdir} -I${cmanincdir} CFLAGS += -I. -I../include -I../../group/lib --- cluster/fence/fenced/main.c 2007/08/15 20:55:02 1.42 +++ cluster/fence/fenced/main.c 2007/08/22 08:58:42 1.43 @@ -607,7 +607,7 @@ break; case 'V': - printf("fenced %s (built %s %s)\n", FENCE_RELEASE_NAME, + printf("fenced %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/gfs/gfs_debug/Makefile 2007/06/01 09:45:32 1.8 +++ cluster/gfs/gfs_debug/Makefile 2007/08/22 08:58:42 1.9 @@ -22,7 +22,7 @@ readfile.o \ util.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -O2 CFLAGS += -I${gfskincdir} CFLAGS += -I../include --- cluster/gfs/gfs_debug/main.c 2006/08/21 21:44:27 1.2 +++ cluster/gfs/gfs_debug/main.c 2007/08/22 08:58:42 1.3 @@ -105,7 +105,7 @@ exit(EXIT_SUCCESS); case 'V': - printf("gfs_mkfs %s (built %s %s)\n", GFS_RELEASE_NAME, __DATE__, __TIME__); + printf("gfs_mkfs %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/gfs/gfs_edit/Makefile 2007/06/01 09:45:33 1.9 +++ cluster/gfs/gfs_edit/Makefile 2007/08/22 08:58:43 1.10 @@ -18,7 +18,7 @@ OBJS= gfshex.o \ hexedit.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -I${gfskincdir} -I${ncursesincdir} CFLAGS += -I../include CFLAGS += -I${incdir} --- cluster/gfs/gfs_edit/hexedit.c 2006/07/10 23:30:56 1.2 +++ cluster/gfs/gfs_edit/hexedit.c 2007/08/22 08:58:43 1.3 @@ -546,7 +546,7 @@ if (!strcasecmp(argv[i], "-verbose")) verbose = TRUE; else if (!strcasecmp(argv[i], "-V")) { - printf("%s %s (built %s %s)\n", prog_name, GFS_RELEASE_NAME, + printf("%s %s (built %s %s)\n", prog_name, RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); --- cluster/gfs/gfs_fsck/Makefile 2007/06/01 09:45:33 1.11 +++ cluster/gfs/gfs_fsck/Makefile 2007/08/22 08:58:43 1.12 @@ -46,7 +46,7 @@ super.o \ util.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM CFLAGS += -MMD -O2 CFLAGS += -I../include CFLAGS += -I${incdir} --- cluster/gfs/gfs_fsck/main.c 2007/04/03 17:14:58 1.6 +++ cluster/gfs/gfs_fsck/main.c 2007/08/22 08:58:43 1.7 @@ -57,7 +57,7 @@ void version(void) { printf("GFS fsck %s (built %s %s)\n", - GFS_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); } --- cluster/gfs/gfs_grow/Makefile 2007/06/01 09:45:33 1.10 +++ cluster/gfs/gfs_grow/Makefile 2007/08/22 08:58:43 1.11 @@ -18,7 +18,7 @@ OBJS= main.o \ ondisk.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -I${gfskincdir} CFLAGS += -I../include -I../libgfs CFLAGS += -I${incdir} --- cluster/gfs/gfs_grow/main.c 2007/01/17 19:06:23 1.6 +++ cluster/gfs/gfs_grow/main.c 2007/08/22 08:58:43 1.7 @@ -851,7 +851,7 @@ break; case 'V': printf("%s %s (built %s %s)\n", argv[0], - GFS_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); case 'h': --- cluster/gfs/gfs_jadd/Makefile 2007/06/01 09:45:33 1.10 +++ cluster/gfs/gfs_jadd/Makefile 2007/08/22 08:58:43 1.11 @@ -18,7 +18,7 @@ OBJS= main.o \ ondisk.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -I${gfskincdir} CFLAGS += -I../include -I../libgfs CFLAGS += -I${incdir} --- cluster/gfs/gfs_jadd/main.c 2006/08/21 21:44:28 1.5 +++ cluster/gfs/gfs_jadd/main.c 2007/08/22 08:58:43 1.6 @@ -839,7 +839,7 @@ break; case 'V': printf("%s %s (built %s %s)\n", argv[0], - GFS_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); case 'h': --- cluster/gfs/gfs_mkfs/Makefile 2007/06/01 09:45:33 1.10 +++ cluster/gfs/gfs_mkfs/Makefile 2007/08/22 08:58:44 1.11 @@ -23,7 +23,7 @@ ondisk.o \ structures.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -O2 CFLAGS += -I${gfskincdir} -I${volidincdir} CFLAGS += -I../include -I../libgfs --- cluster/gfs/gfs_mkfs/main.c 2007/07/12 15:45:43 1.8 +++ cluster/gfs/gfs_mkfs/main.c 2007/08/22 08:58:44 1.9 @@ -151,7 +151,7 @@ case 'V': - printf("gfs_mkfs %s (built %s %s)\n", GFS_RELEASE_NAME, __DATE__, __TIME__); + printf("gfs_mkfs %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); break; --- cluster/gfs/gfs_quota/Makefile 2007/06/01 09:45:33 1.9 +++ cluster/gfs/gfs_quota/Makefile 2007/08/22 08:58:44 1.10 @@ -21,7 +21,7 @@ ondisk.o \ layout.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -O2 CFLAGS += -I${gfskincdir} CFLAGS += -I../include --- cluster/gfs/gfs_quota/main.c 2007/04/04 21:31:33 1.4 +++ cluster/gfs/gfs_quota/main.c 2007/08/22 08:58:44 1.5 @@ -192,7 +192,7 @@ break; case 'V': - printf("gfs_quota %s (built %s %s)\n", GFS_RELEASE_NAME, + printf("gfs_quota %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/gfs/gfs_tool/Makefile 2007/06/01 09:45:33 1.12 +++ cluster/gfs/gfs_tool/Makefile 2007/08/22 08:58:44 1.13 @@ -25,7 +25,7 @@ tune.o \ util.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -O2 -Wall CFLAGS += -I${gfskincdir} CFLAGS += -I../include --- cluster/gfs/gfs_tool/main.c 2005/01/04 10:07:10 1.10 +++ cluster/gfs/gfs_tool/main.c 2007/08/22 08:58:44 1.11 @@ -135,7 +135,7 @@ print_version(void) { printf("gfs_tool %s (built %s %s)\n", - GFS_RELEASE_NAME, + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); --- cluster/gfs/libgfs/Makefile 2007/06/01 09:45:33 1.7 +++ cluster/gfs/libgfs/Makefile 2007/08/22 08:58:45 1.8 @@ -16,7 +16,7 @@ TARGET=libgfs.a CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM CFLAGS += -c -Wall -ggdb CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ CFLAGS += -I${gfskincdir} -I../include --- cluster/gfs-kernel/src/gfs/gfs.h 2006/10/05 16:04:38 1.13 +++ cluster/gfs-kernel/src/gfs/gfs.h 2007/08/22 08:58:45 1.14 @@ -14,7 +14,7 @@ #ifndef __GFS_DOT_H__ #define __GFS_DOT_H__ -#define GFS_RELEASE_NAME "" +#define RELEASE_VERSION "" #include --- cluster/gfs-kernel/src/gfs/main.c 2007/07/23 16:41:46 1.10 +++ cluster/gfs-kernel/src/gfs/main.c 2007/08/22 08:58:45 1.11 @@ -81,7 +81,7 @@ goto fail; printk("GFS %s (built %s %s) installed\n", - GFS_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); return 0; @@ -125,7 +125,7 @@ gfs_sys_uninit(); } -MODULE_DESCRIPTION("Global File System " GFS_RELEASE_NAME); +MODULE_DESCRIPTION("Global File System " RELEASE_VERSION); MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); --- cluster/gfs2/convert/Makefile 2007/06/01 09:45:34 1.9 +++ cluster/gfs2/convert/Makefile 2007/08/22 08:58:45 1.10 @@ -16,7 +16,7 @@ OBJS= gfs2_convert.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS2_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM CFLAGS += -Wall -g CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ CFLAGS += -I../include -I../libgfs2 --- cluster/gfs2/convert/gfs2_convert.c 2007/08/15 22:28:18 1.11 +++ cluster/gfs2/convert/gfs2_convert.c 2007/08/22 08:58:45 1.12 @@ -820,7 +820,7 @@ /* ------------------------------------------------------------------------- */ void version(void) { - log_notice("gfs2_convert version %s (built %s %s)\n", GFS2_RELEASE_NAME, + log_notice("gfs2_convert version %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); log_notice("%s\n\n", REDHAT_COPYRIGHT); } --- cluster/gfs2/debug/Makefile 2006/08/11 15:18:12 1.3 +++ cluster/gfs2/debug/Makefile 2007/08/22 08:58:45 1.4 @@ -24,8 +24,7 @@ readfile.c \ util.c -CFLAGS+= -O2 -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 \ - -DGFS2_RELEASE_NAME=\"${RELEASE}\" +CFLAGS+= -O2 -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config \ -I${gfs2kincdir} -I${incdir} --- cluster/gfs2/debug/main.c 2005/04/26 02:58:56 1.1 +++ cluster/gfs2/debug/main.c 2007/08/22 08:58:45 1.2 @@ -105,7 +105,7 @@ exit(EXIT_SUCCESS); case 'V': - printf("gfs2_mkfs %s (built %s %s)\n", GFS2_RELEASE_NAME, __DATE__, __TIME__); + printf("gfs2_mkfs %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/gfs2/edit/Makefile 2007/08/21 04:46:43 1.10 +++ cluster/gfs2/edit/Makefile 2007/08/22 08:58:46 1.11 @@ -19,7 +19,7 @@ savemeta.o \ hexedit.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS2_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 CFLAGS += -ggdb CFLAGS += -I${ncursesincdir} CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ --- cluster/gfs2/edit/hexedit.c 2007/07/30 15:31:23 1.18 +++ cluster/gfs2/edit/hexedit.c 2007/08/22 08:58:46 1.19 @@ -2000,7 +2000,7 @@ if (!pass) { if (!strcasecmp(argv[i], "-V")) { printf("%s version %s (built %s %s)\n", prog_name, - GFS2_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); } --- cluster/gfs2/fsck/Makefile 2007/08/15 22:28:18 1.13 +++ cluster/gfs2/fsck/Makefile 2007/08/22 08:58:46 1.14 @@ -34,7 +34,7 @@ rgrepair.o \ util.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM CFLAGS += -MMD -Wall -O2 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ CFLAGS += -I../include -I../libgfs2 --- cluster/gfs2/fsck/main.c 2007/08/15 22:28:18 1.8 +++ cluster/gfs2/fsck/main.c 2007/08/22 08:58:46 1.9 @@ -80,7 +80,7 @@ void version(void) { printf("GFS2 fsck %s (built %s %s)\n", - GFS_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); } --- cluster/gfs2/libgfs2/Makefile 2007/06/01 09:45:34 1.8 +++ cluster/gfs2/libgfs2/Makefile 2007/08/22 08:58:46 1.9 @@ -16,8 +16,7 @@ TARGET= libgfs2.a ## Bob: add -O2 back in and take -ggdb out -CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE CFLAGS += -Wall -ggdb CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ CFLAGS += -I../include --- cluster/gfs2/mkfs/Makefile 2007/06/01 09:45:34 1.18 +++ cluster/gfs2/mkfs/Makefile 2007/08/22 08:58:46 1.19 @@ -15,8 +15,7 @@ main_grow.o \ main_jadd.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE CFLAGS += -Wall -O2 -ggdb CFLAGS += -I${KERNEL_SRC}/include/ CFLAGS += -I../include/ -I../libgfs2/ --- cluster/gfs2/mkfs/main_grow.c 2007/05/10 15:47:45 1.4 +++ cluster/gfs2/mkfs/main_grow.c 2007/08/22 08:58:46 1.5 @@ -80,7 +80,7 @@ break; case 'V': printf("%s %s (built %s %s)\n", argv[0], - GFS2_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); case 'h': --- cluster/gfs2/mkfs/main_jadd.c 2007/06/26 01:43:17 1.12 +++ cluster/gfs2/mkfs/main_jadd.c 2007/08/22 08:58:46 1.13 @@ -131,7 +131,7 @@ sdp->quiet = TRUE; break; case 'V': - printf("gfs2_jadd %s (built %s %s)\n", GFS2_RELEASE_NAME, + printf("gfs2_jadd %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/gfs2/mkfs/main_mkfs.c 2007/07/12 15:45:44 1.16 +++ cluster/gfs2/mkfs/main_mkfs.c 2007/08/22 08:58:46 1.17 @@ -151,7 +151,7 @@ break; case 'V': - printf("gfs2_mkfs %s (built %s %s)\n", GFS2_RELEASE_NAME, + printf("gfs2_mkfs %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/gfs2/mount/Makefile 2007/08/21 04:46:43 1.16 +++ cluster/gfs2/mount/Makefile 2007/08/22 08:58:46 1.17 @@ -23,8 +23,7 @@ util.o \ mtab.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -CFLAGS += -DGFS2_RELEASE_NAME=\"${RELEASE}\" -D_GNU_SOURCE +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -O2 CFLAGS += -I${gfskincdir} CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ --- cluster/gfs2/mount/mount.gfs2.c 2007/08/06 19:23:40 1.26 +++ cluster/gfs2/mount/mount.gfs2.c 2007/08/22 08:58:46 1.27 @@ -15,7 +15,7 @@ static void print_version(void) { - printf("mount.gfs2 %s (built %s %s)\n", GFS2_RELEASE_NAME, + printf("mount.gfs2 %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); } --- cluster/gfs2/mount/umount.gfs2.c 2007/06/13 18:12:36 1.14 +++ cluster/gfs2/mount/umount.gfs2.c 2007/08/22 08:58:46 1.15 @@ -16,7 +16,7 @@ static void print_version(void) { - printf("umount.gfs2 %s (built %s %s)\n", GFS2_RELEASE_NAME, + printf("umount.gfs2 %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); } --- cluster/gfs2/quota/Makefile 2007/08/21 04:46:43 1.11 +++ cluster/gfs2/quota/Makefile 2007/08/22 08:58:46 1.12 @@ -19,8 +19,7 @@ names.o \ check.o -CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -O2 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ CFLAGS += -I../include -I../libgfs2/ --- cluster/gfs2/quota/main.c 2007/05/31 22:32:40 1.6 +++ cluster/gfs2/quota/main.c 2007/08/22 08:58:46 1.7 @@ -157,7 +157,7 @@ break; case 'V': - printf("gfs2_quota %s (built %s %s)\n", GFS2_RELEASE_NAME, + printf("gfs2_quota %s (built %s %s)\n", RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(EXIT_SUCCESS); --- cluster/gfs2/tool/Makefile 2007/08/21 04:46:43 1.10 +++ cluster/gfs2/tool/Makefile 2007/08/22 08:58:46 1.11 @@ -25,7 +25,7 @@ tune.o \ util.o -CFLAGS += -D_FILE_OFFSET_BITS=64 -DGFS2_RELEASE_NAME=\"${RELEASE}\" +CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -O2 -Wall CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/ CFLAGS += -I../include --- cluster/gfs2/tool/main.c 2006/05/05 18:06:09 1.4 +++ cluster/gfs2/tool/main.c 2007/08/22 08:58:46 1.5 @@ -139,7 +139,7 @@ print_version(void) { printf("gfs2_tool %s (built %s %s)\n", - GFS2_RELEASE_NAME, + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); --- cluster/gnbd/client/Makefile 2007/06/01 09:45:35 1.13 +++ cluster/gnbd/client/Makefile 2007/08/22 08:58:47 1.14 @@ -25,7 +25,6 @@ SHAREDOBJS= ../utils/trans.o \ ../utils/gnbd_utils.o -CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -O2 CFLAGS += -I${gnbdkincdir} -I${cmanincdir} CFLAGS += -I../include -I../server -I../utils --- cluster/gnbd/client/gnbd_recvd.c 2006/08/11 15:18:14 1.6 +++ cluster/gnbd/client/gnbd_recvd.c 2007/08/22 08:58:47 1.7 @@ -141,7 +141,7 @@ verbosity = VERBOSE; continue; case 'V': - printf("%s %s (built %s %s)\n", program_name, GNBD_RELEASE_NAME, + printf("%s %s (built %s %s)\n", program_name, RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); --- cluster/gnbd/server/Makefile 2007/06/01 09:45:35 1.13 +++ cluster/gnbd/server/Makefile 2007/08/22 08:58:47 1.14 @@ -30,7 +30,6 @@ SHAREDOBJS= ../utils/gnbd_utils.o CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -O2 CFLAGS += -I${gnbdkincdir} -I${cmanincdir} CFLAGS += -I../include -I../utils --- cluster/gnbd/server/gnbd_serv.c 2006/09/21 20:00:01 1.5 +++ cluster/gnbd/server/gnbd_serv.c 2007/08/22 08:58:47 1.6 @@ -323,7 +323,7 @@ continue; case 'V': - printf("%s %s (built %s %s)\n", program_name, GNBD_RELEASE_NAME, + printf("%s %s (built %s %s)\n", program_name, RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); --- cluster/gnbd/tools/fence_gnbd/Makefile 2007/06/01 09:45:35 1.5 +++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/08/22 08:58:47 1.6 @@ -17,7 +17,6 @@ OBJS= main.o -CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -I../../include -I../../tools/gnbd_import CFLAGS += -I${incdir} --- cluster/gnbd/tools/fence_gnbd/main.c 2004/09/21 21:11:07 1.3 +++ cluster/gnbd/tools/fence_gnbd/main.c 2007/08/22 08:58:47 1.4 @@ -128,7 +128,7 @@ switch(c) { case 'V': - printf("%s %s (built %s %s)\n", pname, GNBD_RELEASE_NAME, + printf("%s %s (built %s %s)\n", pname, RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); exit(0); --- cluster/gnbd/tools/gnbd_export/Makefile 2007/06/01 09:45:35 1.14 +++ cluster/gnbd/tools/gnbd_export/Makefile 2007/08/22 08:58:47 1.15 @@ -19,7 +19,7 @@ ../../utils/gnbd_utils.o \ ../../utils/trans.o -CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\" +CFLAGS += -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\" CFLAGS += -O2 CFLAGS += -I${gnbdkincdir} -I${cmanincdir} CFLAGS += -I../../include -I../../server -I../../utils --- cluster/gnbd/tools/gnbd_export/gnbd_export.c 2007/04/30 11:22:19 1.12 +++ cluster/gnbd/tools/gnbd_export/gnbd_export.c 2007/08/22 08:58:47 1.13 @@ -793,7 +793,7 @@ continue; case 'V': printf("%s %s (built %s %s)\n", argv[0], - GNBD_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); return 0; default: --- cluster/gnbd/tools/gnbd_import/Makefile 2007/06/01 09:45:35 1.11 +++ cluster/gnbd/tools/gnbd_import/Makefile 2007/08/22 08:58:47 1.12 @@ -20,7 +20,6 @@ ../../client/monitor_req.o \ ../../utils/trans.o -CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -O2 CFLAGS += -I${gnbdkincdir} -I${cmanincdir} CFLAGS += -I../../include -I../../client -I../../server -I../../utils --- cluster/gnbd/tools/gnbd_import/gnbd_import.c 2006/10/11 22:10:12 1.19 +++ cluster/gnbd/tools/gnbd_import/gnbd_import.c 2007/08/22 08:58:47 1.20 @@ -1241,7 +1241,7 @@ continue; case 'V': printf("%s %s (built %s %s)\n", argv[0], - GNBD_RELEASE_NAME, __DATE__, __TIME__); + RELEASE_VERSION, __DATE__, __TIME__); printf("%s\n", REDHAT_COPYRIGHT); return 0; case 'v': --- cluster/rgmanager/src/clulib/Makefile 2007/06/01 09:45:36 1.15 +++ cluster/rgmanager/src/clulib/Makefile 2007/08/22 08:58:47 1.16 @@ -25,7 +25,6 @@ OBJS3= msgtest.o -CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\" CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE CFLAGS += -I${cmanincdir} -I${dlmincdir} CFLAGS += -I../../include --- cluster/rgmanager/src/utils/Makefile 2007/06/01 09:45:36 1.17 +++ cluster/rgmanager/src/utils/Makefile 2007/08/22 08:58:47 1.18 @@ -21,7 +21,6 @@ DISABLEDTARGETS= cluarp -CFLAGS += -DPACKAGE_VERSION=\"${RELEASE}\" CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir} CFLAGS += -I../../include --- cluster/rgmanager/src/utils/clustat.c 2007/08/15 18:43:00 1.33 +++ cluster/rgmanager/src/utils/clustat.c 2007/08/22 08:58:47 1.34 @@ -951,7 +951,7 @@ goto cleanup; case VERSION_ONLY: printf("%s version %s\n", basename(argv[0]), - PACKAGE_VERSION); + RELEASE_VERSION); if (!ch) break; goto cleanup; --- cluster/rgmanager/src/utils/clusvcadm.c 2007/07/23 20:49:13 1.21 +++ cluster/rgmanager/src/utils/clusvcadm.c 2007/08/22 08:58:47 1.22 @@ -311,7 +311,7 @@ node_specified = 1; break; case 'v': - printf("%s\n",PACKAGE_VERSION); + printf("%s\n",RELEASE_VERSION); return 0; case 'Z': actionstr = "freezing";