[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, master, updated. gfs-kernel_0_1_22-210-g51330c1



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=51330c183610c7c97f00ff8e5e202d4f70195a75

The branch, master has been updated
       via  51330c183610c7c97f00ff8e5e202d4f70195a75 (commit)
       via  4739b6760627ae906cef62b2223b564e43088cc1 (commit)
       via  fcb7405d46fca41cad19982a14cb6d1824dff199 (commit)
      from  8170e8d76373ffa1d7e2beaffd5b86a120a14de6 (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 51330c183610c7c97f00ff8e5e202d4f70195a75
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Fri Apr 25 09:01:14 2008 +0200

    [BUILD] Fix kernel check for good
    
    Use the top level Makefile of the source tree rather than
    random includes that keeps changing.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

commit 4739b6760627ae906cef62b2223b564e43088cc1
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Fri Apr 25 08:27:57 2008 +0200

    [BUILD] Fix building with separate object dir
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

commit fcb7405d46fca41cad19982a14cb6d1824dff199
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Fri Apr 25 07:19:33 2008 +0200

    [BUILD] Deal with new libfenced
    
    configure, make/defines.mk.input:
      - add fencedincdir and fencedlibdir options for the shared library.
      - set default for fenceincdir and fencelibdir to ./fence/libfence (renamed).
    
    fence/Makefile:
      - build the shared lib.
    
    fence/fence_node/Makefile, fence/fence_tool/Makefile:
      - use fencedincdir and fencedlibdir.
      - add build-dep on the shared library.
    
    fence/fenced/Makefile:
      - update depends on libfence (renamed).
    
    fence/libfenced/Makefile:
      - use path to source instead of direct include to fenced.
    
    fence/lib:
      - renamed to fence/libfence.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

-----------------------------------------------------------------------

Summary of changes:
 configure                          |   77 ++++++++++++++++-------------------
 fence/Makefile                     |    2 +-
 fence/fence_node/Makefile          |    9 ++--
 fence/fence_tool/Makefile          |   13 ++++--
 fence/fenced/Makefile              |    7 ++-
 fence/{lib => libfence}/Makefile   |    0 
 fence/{lib => libfence}/agent.c    |    0 
 fence/{lib => libfence}/libfence.h |    0 
 fence/libfenced/Makefile           |    3 +-
 make/defines.mk.input              |    2 +
 10 files changed, 57 insertions(+), 56 deletions(-)
 rename fence/{lib => libfence}/Makefile (100%)
 rename fence/{lib => libfence}/agent.c (100%)
 rename fence/{lib => libfence}/libfence.h (100%)

diff --git a/configure b/configure
index 27777fe..292215c 100755
--- a/configure
+++ b/configure
@@ -54,6 +54,8 @@ my %options = (
 	dlmlibdir => \$dlmlibdir,
 	fenceincdir => \$fenceincdir,
 	fencelibdir => \$fencelibdir,
+	fencedincdir => \$fenceincdir,
+	fencedlibdir => \$fencelibdir,
 	volidincdir => \$volidincdir,
 	volidlibdir => \$volidlibdir,
 	ncursesincdir => \$ncursesincdir,
@@ -128,6 +130,8 @@ my $err = &GetOptions (\%options,
 		    'dlmlibdir=s',
 		    'fenceincdir=s',
 		    'fencelibdir=s',
+		    'fencedincdir=s',
+		    'fencedlibdir=s',
 		    'volidincdir=s',
 		    'volidlibdir=s',
 		    'ncursesincdir=s',
@@ -219,8 +223,10 @@ if ($help || !$err) {
   print "--cmanlibdir=\tthe base directory for cman libraries.  (Default: ./cman/lib)\n";
   print "--dlmincdir=\tthe base directory for dlm include files.  (Default: ./dlm/lib)\n";
   print "--dlmlibdir=\tthe base directory for dlm libraries.  (Default: ./dlm/lib)\n";
-  print "--fenceincdir=\tthe base directory for fence include files.  (Default: ./fence/lib)\n";
-  print "--fencelibdir=\tthe base directory for fence libraries.  (Default: ./fence/lib)\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";
+  print "--fencedlibdir=\tthe base directory for fenced libraries.  (Default: ./fence/libfenced)\n";
   print "--volidincdir=\tthe base directory for volume_id include files.  (Default: {incdir})\n";
   print "--volidlibdir=\tthe base directory for volume_id libraries.  (Default: {libdir})\n";
   print "--ncursesincdir=\tthe base directory for ncurses include files.  (Default: {incdir})\n";
@@ -260,64 +266,43 @@ if ($help || !$err) {
 }
 
 sub kernel_version {
-  my $autoconf_path = shift;
+  my $makefile_path = shift;
   my $required_version = shift;
-  my $build_version = 0;
-  my $build_patchlevel = 0;
-  my $build_sublevel = 0;
 
   print "\nChecking kernel:\n";
 
   # add autoconf to the path
-  $autoconf_path .= '/include/linux/autoconf.h';
+  $makefile_path .= '/Makefile';
   my @version = split /\./, $required_version;
-  my $current_version = 0;
-  if ( -f $autoconf_path ) {
-    # open the autoconf.h to feth VERSION, PATCHLEVEL and SUBLEVEL, if needed I can add EXTRAVERSION too
-    open AUTOCONF, '<', $autoconf_path;
-    while (<AUTOCONF>) {
-      if ($_ =~ /CONFIG_KERNELVERSION/) {
-        $current_version = $_;
-        # we don't need to check any thing else in this file so we are stopping the read
-        last;
-      }
+  if ( -f $makefile_path ) {
+    # open the toplevel Makefile to feth VERSION, PATCHLEVEL and SUBLEVEL
+    open MAKEFILE, '<', $makefile_path;
+    while (<MAKEFILE>) {
+      $build_version = $1 if /^VERSION = (\d+)/;
+      $build_patchlevel = $1 if /^PATCHLEVEL = (\d+)/;
+      $build_sublevel = $1 if /^SUBLEVEL = (\d+)/;
+      last if (defined $build_version && defined $build_patchlevel && defined $build_sublevel);
     }
-    close AUTOCONF;
-    # Warn and continue if CONFIG_KERNELVERSION was not found
-    if (!$current_version) {
+    close MAKEFILE;
+    # Warn and continue if kernel version was not found
+    if (!$build_version || !$build_patchlevel || !$build_sublevel) {
 	print " WARNING: Could not determine kernel version.\n";
+	print "          Build might fail!\n";
 	return 1;
     }
-    # leaving only the numbers from the lines
-    # this is faster then split and doesn't alocate useless arrays
-    $current_version =~ s/.*"(.*)"\n/$1/;
-    # parse the kernel version into the variables
-    if ($current_version =~ /\-/) {
-        my @line = split /\-/, $current_version;
-        my @ver  = split /\./, $line[0];
-        $build_version = $ver[0];
-        $build_patchlevel = $ver[1];
-        $build_sublevel = $ver[2];
-    } else {
-        my @kernel = split /\./, $current_version;
-        $build_version = $kernel[0];
-        $build_patchlevel = $kernel[1];
-        $build_sublevel = $kernel[2];
-    }
     # checking VERSION, PATCHLEVEL and SUBLEVEL for the supplied kernel
-    # if needed I can add also EXTRAVERSION to the check
     if ($build_version >= $version[0] &&
         $build_patchlevel >= $version[1] &&
         $build_sublevel >= $version[2]) {
       print " Current kernel version appears to be OK\n";
       return 1;
     } else {
-      print " Current kernel version: ",$current_version,"\n Minimum kernel version: ",$required_version,"\n";
+      print " Current kernel version: ",$build_version, "." , $build_patchlevel, ".", $build_sublevel, "\n Minimum kernel version: ",$required_version,"\n";
       print " FAILED!\n";
       return 0;
     }
   } else {
-    print " Unable to find ($autoconf_path)!\n";
+    print " Unable to find ($makefile_path)!\n";
     print " Make sure that:\n - the above path is correct\n";
     print " - your kernel is properly configured and prepared.\n";
     print " - kernel_build and kernel_src options to configure are set properly.\n";
@@ -409,7 +394,7 @@ if (!$kernel_src) {
     $kernel_src=$kernel_build;
   }
 }
-if (not $disable_kernel_check and !kernel_version($kernel_build,$required_kernelversion)) {
+if (not $disable_kernel_check and !kernel_version($kernel_src,$required_kernelversion)) {
   exit 1;
 }
 if (!$module_dir) {
@@ -446,10 +431,16 @@ if (!$dlmlibdir) {
   $dlmlibdir="${objdir}/dlm/lib";
 }
 if (!$fenceincdir) {
-  $fenceincdir="${cdir}/fence/lib";
+  $fenceincdir="${cdir}/fence/libfence";
 }
 if (!$fencelibdir) {
-  $fencelibdir="${objdir}/fence/lib";
+  $fencelibdir="${objdir}/fence/libfence";
+}
+if (!$fencedincdir) {
+  $fencedincdir="${cdir}/fence/libfenced";
+}
+if (!$fencedlibdir) {
+  $fencedlibdir="${objdir}/fence/libfenced";
 }
 if (!$volidincdir) {
   $volidincdir="${incdir}";
@@ -651,6 +642,8 @@ while (<IFILE>) {
   $_ =~ s/\ DLMLIBDIR\@/$dlmlibdir/;
   $_ =~ s/\ FENCEINCDIR\@/$fenceincdir/;
   $_ =~ s/\ FENCELIBDIR\@/$fencelibdir/;
+  $_ =~ s/\ FENCEDINCDIR\@/$fencedincdir/;
+  $_ =~ s/\ FENCEDLIBDIR\@/$fencedlibdir/;
   $_ =~ s/\ VOLIDINCDIR\@/$volidincdir/;
   $_ =~ s/\ VOLIDLIBDIR\@/$volidlibdir/;
   $_ =~ s/\ READLINEINCDIR\@/$readlineincdir/;
diff --git a/fence/Makefile b/fence/Makefile
index 31734a4..1da7db5 100644
--- a/fence/Makefile
+++ b/fence/Makefile
@@ -14,4 +14,4 @@
 include ../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=agents lib fenced fence_node fence_tool man
+SUBDIRS=agents libfence libfenced fenced fence_node fence_tool man
diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile
index c4dede7..307834d 100644
--- a/fence/fence_node/Makefile
+++ b/fence/fence_node/Makefile
@@ -27,17 +27,18 @@ OBJS=	fence_node.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
 
-CFLAGS += -I${ccsincdir} -I${fenceincdir}
+CFLAGS += -I${ccsincdir} -I${fenceincdir} -I${fencedincdir}
 CFLAGS += -I../include
-CFLAGS += -I${incdir} -I../libfenced
+CFLAGS += -I${incdir}
 
-LDFLAGS += -L${ccslibdir} -L${fencelibdir} -lccs -lfence -lfenced
+LDFLAGS += -L${ccslibdir} -L${fencelibdir} -L${fencedlibdir} -lccs -lfence -lfenced
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 depends:
-	$(MAKE) -C ../lib
+	$(MAKE) -C ../libfence
+	$(MAKE) -C ../libfenced
 
 clean: generalclean
 
diff --git a/fence/fence_tool/Makefile b/fence/fence_tool/Makefile
index cd64b96..faf6580 100644
--- a/fence/fence_tool/Makefile
+++ b/fence/fence_tool/Makefile
@@ -15,7 +15,7 @@ TARGET = fence_tool
 
 SBINDIRT=$(TARGET)
 
-all: ${TARGET}
+all: depends ${TARGET}
 
 include ../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
@@ -26,16 +26,19 @@ include $(OBJDIR)/make/uninstall.mk
 OBJS=fence_tool.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fencedincdir}
 CFLAGS += -I$(S)/../include -I$(SRCDIR)/group/lib
-CFLAGS += -I${incdir} -I../libfenced
+CFLAGS += -I${incdir} 
 
-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
-LDFLAGS += -L../../group/lib -lgroup -lfenced
+LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${fencedlibdir} -lccs -lcman -lfenced
+LDFLAGS += -L../../group/lib -lgroup 
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
+depends:
+	$(MAKE) -C ../libfenced
+
 clean: generalclean
 
 -include $(OBJS:.o=.d)
diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile
index 5a39356..65d4262 100644
--- a/fence/fenced/Makefile
+++ b/fence/fenced/Makefile
@@ -31,9 +31,10 @@ OBJS=	config.o \
 	recover.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${openaisincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${fencedincdir}
+CFLAGS += -I${openaisincdir}
 CFLAGS += -I$(S) -I$(S)/../include -I$(SRCDIR)/group/lib
-CFLAGS += -I${incdir} -I../libfenced
+CFLAGS += -I${incdir}
 
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${openaislibdir} -lccs -lcman -lcpg
 LDFLAGS += -L${fencelibdir} -L${openaislibdir} -lfence -lcpg
@@ -44,7 +45,7 @@ ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 depends:
-	$(MAKE) -C ../lib
+	$(MAKE) -C ../libfence
 
 clean: generalclean
 
diff --git a/fence/lib/Makefile b/fence/libfence/Makefile
similarity index 100%
rename from fence/lib/Makefile
rename to fence/libfence/Makefile
diff --git a/fence/lib/agent.c b/fence/libfence/agent.c
similarity index 100%
rename from fence/lib/agent.c
rename to fence/libfence/agent.c
diff --git a/fence/lib/libfence.h b/fence/libfence/libfence.h
similarity index 100%
rename from fence/lib/libfence.h
rename to fence/libfence/libfence.h
diff --git a/fence/libfenced/Makefile b/fence/libfenced/Makefile
index 0d500f5..2191f1f 100644
--- a/fence/libfenced/Makefile
+++ b/fence/libfenced/Makefile
@@ -35,7 +35,8 @@ include $(OBJDIR)/make/uninstall.mk
 OBJS=	main.o
 
 CFLAGS += -fPIC
-CFLAGS += -I${incdir} -I../fenced
+CFLAGS += -I$(S)/../fenced
+CFLAGS += -I${incdir}
 
 $(TARGET).a: $(OBJS)
 	${AR} r $@ $^
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 6482cbe..bdf0db3 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -50,6 +50,8 @@ dlmincdir ?= @DLMINCDIR@
 dlmlibdir ?= @DLMLIBDIR@
 fenceincdir ?= @FENCEINCDIR@
 fencelibdir ?= @FENCELIBDIR@
+fencedincdir ?= @FENCEDINCDIR@
+fencedlibdir ?= @FENCEDLIBDIR@
 volidincdir ?= @VOLIDINCDIR@
 volidlibdir ?= @VOLIDLIBDIR@
 readlineincdir ?= @READLINEINCDIR@


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]