[Cluster-devel] cluster/fence configure agents/Makefile agents ...
lhh at sourceware.org
lhh at sourceware.org
Thu Oct 5 18:49:02 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2006-10-05 18:48:59
Modified files:
fence : configure
fence/agents : Makefile
fence/agents/xvm: fence_xvm.c fence_xvmd.c
fence/make : defines.mk.input
Log message:
Add --enable_xen configuration option (off by default), and make sure -V flag works for fence_xvm[d]
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/configure.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvm.c.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvmd.c.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/make/defines.mk.input.diff?cvsroot=cluster&r1=1.3&r2=1.4
--- cluster/fence/configure 2006/05/11 20:46:09 1.6
+++ cluster/fence/configure 2006/10/05 18:48:58 1.7
@@ -33,6 +33,7 @@
mandir => \$mandir,
prefix => \$prefix,
sbindir => \$sbindir,
+ enable_xen => \$enable_xen,
verbose => \$verbose
);
@@ -48,6 +49,7 @@
'prefix=s',
'sbindir=s',
'sharedir=s',
+ 'enable_xen',
'verbose');
if(!$err) {
@@ -72,6 +74,7 @@
print "--prefix=\tthe base directory to install into. (Default: /)\n";
print "--sbindir=\tthe base directory for system binaries. (Default: /sbin)\n";
print "--sharedir=\tthe base directory for misc cluster files. (Default: /usr/share/cluster)\n";
+ print "--enable_xen\t\tEnable building of Xen-specific pieces\n";
print "--verbose\t\tVerbose output\n";
exit $ret;
}
@@ -105,6 +108,9 @@
if (!$sharedir) {
$sharedir="${prefix}/usr/share/cluster";
}
+if ($enable_xen) {
+ verbose("Xen support enabled\n");
+}
open IFILE, "<make/defines.mk.input" or die "Can't redirect stdin";
@@ -124,6 +130,7 @@
$_ =~ s/\@MANDIR\@/$mandir/;
$_ =~ s/\@SBINDIR\@/$sbindir/;
$_ =~ s/\@SHAREDIR\@/$sharedir/;
+ $_ =~ s/\@ENABLE_XEN\@/$enable_xen/;
print OFILE "$_\n";
}
--- cluster/fence/agents/Makefile 2006/10/05 16:11:36 1.14
+++ cluster/fence/agents/Makefile 2006/10/05 18:48:58 1.15
@@ -10,6 +10,8 @@
##
###############################################################################
###############################################################################
+top_srcdir=..
+include ${top_srcdir}/make/defines.mk
all:
@@ -34,7 +36,7 @@
${MAKE} -C vixel all
${MAKE} -C wti all
# ${MAKE} -C xcat all
- ${MAKE} -C xvm all
+ [ "${enable_xen}" != "1" ] || ${MAKE} -C xvm all
# ${MAKE} -C zvm all
install: all
@@ -59,7 +61,7 @@
${MAKE} -C vixel install
${MAKE} -C wti install
# ${MAKE} -C xcat install
- ${MAKE} -C xvm install
+ [ "${enable_xen}" != "1" ] || ${MAKE} -C xvm install
# ${MAKE} -C zvm install
clean:
@@ -84,5 +86,5 @@
${MAKE} -C vixel clean
${MAKE} -C wti clean
# ${MAKE} -C xcat clean
- ${MAKE} -C xvm clean
+ [ "${enable_xen}" != "1" ] || ${MAKE} -C xvm clean
# ${MAKE} -C zvm clean
--- cluster/fence/agents/xvm/fence_xvm.c 2006/10/05 16:11:36 1.1
+++ cluster/fence/agents/xvm/fence_xvm.c 2006/10/05 18:48:58 1.2
@@ -308,7 +308,7 @@
main(int argc, char **argv)
{
fence_xvm_args_t args;
- char *my_options = "di:a:p:r:C:c:k:H:uo:t:?h";
+ char *my_options = "di:a:p:r:C:c:k:H:uo:t:?hV";
args_init(&args);
if (argc == 1) {
--- cluster/fence/agents/xvm/fence_xvmd.c 2006/10/05 16:11:36 1.1
+++ cluster/fence/agents/xvm/fence_xvmd.c 2006/10/05 18:48:58 1.2
@@ -580,7 +580,7 @@
int mc_sock;
char key[4096];
int key_len;
- char *my_options = "dfi:a:p:C:c:k:u?h";
+ char *my_options = "dfi:a:p:C:c:k:u?hV";
void *h;
args_init(&args);
--- cluster/fence/make/defines.mk.input 2006/05/11 20:46:09 1.3
+++ cluster/fence/make/defines.mk.input 2006/10/05 18:48:58 1.4
@@ -19,6 +19,7 @@
incdir ?= ${DESTDIR}/@INCDIR@
cmanincdir ?= ${DESTDIR}@CMANINCDIR@
ccsincdir ?= ${DESTDIR}@CCSINCDIR@
+enable_xen ?= @ENABLE_XEN@
# Where's the kernel?
KERNEL_SRC = @KERNEL_SRC@
More information about the Cluster-devel
mailing list