Cluster Project branch, master, updated. cluster-2.99.02-33-g3a37c3f
fabbione@sourceware.org
fabbione@sourceware.org
Thu May 29 05:58:00 GMT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=3a37c3f5d88469d9f6de80d84a6f8664cc1a285c
The branch, master has been updated
via 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c (commit)
via d679b5fb411175c5c9346b1993de2956358254a8 (commit)
via e84a493caf0e64da936eeaa7fc3da0aa55024828 (commit)
from d33f4f1df3e8f84603418d0192c1af18794d3136 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3a37c3f5d88469d9f6de80d84a6f8664cc1a285c
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Thu May 29 07:57:31 2008 +0200
[BUILD] Change build system to cope with new libgfscontrol
NOTE: you will need to rerun configure to set the new variables
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit d679b5fb411175c5c9346b1993de2956358254a8
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Thu May 29 07:57:03 2008 +0200
[GROUP] libgfscontrol: fix build with gcc-4.3
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit e84a493caf0e64da936eeaa7fc3da0aa55024828
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Thu May 29 07:56:04 2008 +0200
[GFS] remove symlink to umount.gfs2
umount.gfs2 is gone with commit d33f4f1df3e8f84603418d0192c1af18794d3136
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
-----------------------------------------------------------------------
Summary of changes:
configure | 14 ++++++++++++++
gfs/Makefile | 5 ++---
group/Makefile | 4 ++--
group/gfs_control/Makefile | 7 ++-----
group/gfs_controld/Makefile | 5 +++--
group/libgfscontrol/main.c | 1 +
make/defines.mk.input | 2 ++
7 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index bc0203e..c2b648d 100755
--- a/configure
+++ b/configure
@@ -54,6 +54,8 @@ my %options = (
dlmlibdir => \$dlmlibdir,
dlmcontrolincdir => \$dlmcontrolincdir,
dlmcontrollibdir => \$dlmcontrollibdir,
+ gfscontrolincdir => \$gfscontrolincdir,
+ gfscontrollibdir => \$gfscontrollibdir,
fenceincdir => \$fenceincdir,
fencelibdir => \$fencelibdir,
fencedincdir => \$fenceincdir,
@@ -133,6 +135,8 @@ my $err = &GetOptions (\%options,
'dlmlibdir=s',
'dlmcontrolincdir=s',
'dlmcontrollibdir=s',
+ 'gfscontrolincdir=s',
+ 'gfscontrollibdir=s',
'fenceincdir=s',
'fencelibdir=s',
'fencedincdir=s',
@@ -232,6 +236,8 @@ if ($help || !$err) {
print "--dlmlibdir=\tthe base directory for dlm libraries. (Default: ./dlm/libdlm)\n";
print "--dlmcontrolincdir=\tthe base directory for dlmcontrol include files. (Default: ./dlm/libdlmcontrol)\n";
print "--dlmcontrollibdir=\tthe base directory for dlmcontrol libraries. (Default: ./dlm/libdlmcontrol)\n";
+ print "--gfscontrolincdir=\tthe base directory for gfscontrol include files. (Default: ./group/libgfscontrol)\n";
+ print "--gfscontrollibdir=\tthe base directory for gfscontrol libraries. (Default: ./group/libgfscontrol)\n";
print "--fenceincdir=\tthe base directory for fence include files. (Default: ./fence/libfence)\n";
print "--fencelibdir=\tthe base directory for fence libraries. (Default: ./fence/libfence)\n";
print "--fencedincdir=\tthe base directory for fenced include files. (Default: ./fence/libfenced)\n";
@@ -445,6 +451,12 @@ if (!$dlmcontrolincdir) {
if (!$dlmcontrollibdir) {
$dlmcontrollibdir="${objdir}/dlm/libdlmcontrol";
}
+if (!$gfscontrolincdir) {
+ $gfscontrolincdir="${cdir}/group/libgfscontrol";
+}
+if (!$gfscontrollibdir) {
+ $gfscontrollibdir="${objdir}/group/libgfscontrol";
+}
if (!$fenceincdir) {
$fenceincdir="${cdir}/fence/libfence";
}
@@ -663,6 +675,8 @@ while (<IFILE>) {
$_ =~ s/\@DLMLIBDIR\@/$dlmlibdir/;
$_ =~ s/\@DLMCONTROLINCDIR\@/$dlmcontrolincdir/;
$_ =~ s/\@DLMCONTROLLIBDIR\@/$dlmcontrollibdir/;
+ $_ =~ s/\@GFSCONTROLINCDIR\@/$gfscontrolincdir/;
+ $_ =~ s/\@GFSCONTROLLIBDIR\@/$gfscontrollibdir/;
$_ =~ s/\@FENCEINCDIR\@/$fenceincdir/;
$_ =~ s/\@FENCELIBDIR\@/$fencelibdir/;
$_ =~ s/\@FENCEDINCDIR\@/$fencedincdir/;
diff --git a/gfs/Makefile b/gfs/Makefile
index 54ad93a..be44504 100644
--- a/gfs/Makefile
+++ b/gfs/Makefile
@@ -2,7 +2,7 @@
###############################################################################
##
## Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+## Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
##
## This copyrighted material is made available to anyone wishing to use,
## modify, copy, or redistribute it subject to the terms and conditions
@@ -26,8 +26,7 @@ all: ${SUBDIRS}
mkdir -p ${DESTDIR}/sbin; \
cd ${DESTDIR}/sbin; \
ln -sf mount.gfs2 mount.gfs; \
- ln -sf umount.gfs2 umount.gfs; \
fi; \
if [ "$@" = "uninstall" ]; then \
- cd ${DESTDIR}/sbin; rm -f mount.gfs umount.gfs; \
+ cd ${DESTDIR}/sbin; rm -f mount.gfs; \
fi
diff --git a/group/Makefile b/group/Makefile
index 6fc6e29..1e03b1a 100644
--- a/group/Makefile
+++ b/group/Makefile
@@ -1,7 +1,7 @@
###############################################################################
###############################################################################
##
-## Copyright (C) 2005 Red Hat, Inc. All rights reserved.
+## Copyright (C) 2005-2008 Red Hat, Inc. All rights reserved.
##
## This copyrighted material is made available to anyone wishing to use,
## modify, copy, or redistribute it subject to the terms and conditions
@@ -13,4 +13,4 @@
include ../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=lib daemon tool dlm_controld gfs_controld man
+SUBDIRS=lib libgfscontrol daemon tool dlm_controld gfs_control gfs_controld man
diff --git a/group/gfs_control/Makefile b/group/gfs_control/Makefile
index 772a0d0..04f73ab 100644
--- a/group/gfs_control/Makefile
+++ b/group/gfs_control/Makefile
@@ -24,14 +24,11 @@ include $(OBJDIR)/make/uninstall.mk
OBJS= main.o
-#CFLAGS += -I${gfscontrolincdir}
-CFLAGS += -I../libgfscontrol/
+CFLAGS += -I${gfscontrolincdir}
CFLAGS += -I${incdir}
CFLAGS += -I${KERNEL_SRC}/include/
-#LDFLAGS += -L${gfscontrollibdir} -lgfscontrol
-LDFLAGS += -L../libgfscontrol/ -lgfscontrol
-
+LDFLAGS += -L${gfscontrollibdir} -lgfscontrol
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile
index 5b23bfd..37f78f4 100644
--- a/group/gfs_controld/Makefile
+++ b/group/gfs_controld/Makefile
@@ -30,9 +30,10 @@ OBJS= main.o \
util.o \
plock.o
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir} -I${fencedincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fencedincdir}
+CFLAGS += -I${gfscontrolincdir} -I${openaisincdir}
CFLAGS += -I${KERNEL_SRC}/include/
-CFLAGS += -I$(S)/../lib/ -I$(S)/../include/ -I../libgfscontrol/
+CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lcman -lccs
diff --git a/group/libgfscontrol/main.c b/group/libgfscontrol/main.c
index 35f6f43..f489d72 100644
--- a/group/libgfscontrol/main.c
+++ b/group/libgfscontrol/main.c
@@ -18,6 +18,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <limits.h>
#include "libgfscontrol.h"
#include "gfs_controld.h"
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 6298bbc..b1f7b66 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -51,6 +51,8 @@ dlmincdir ?= @DLMINCDIR@
dlmlibdir ?= @DLMLIBDIR@
dlmcontrolincdir ?= @DLMCONTROLINCDIR@
dlmcontrollibdir ?= @DLMCONTROLLIBDIR@
+gfscontrolincdir ?= @GFSCONTROLINCDIR@
+gfscontrollibdir ?= @GFSCONTROLLIBDIR@
fenceincdir ?= @FENCEINCDIR@
fencelibdir ?= @FENCELIBDIR@
fencedincdir ?= @FENCEDINCDIR@
hooks/post-receive
--
Cluster Project
More information about the Cluster-cvs
mailing list