[Cluster-devel] Cluster Project branch, master, updated. gfs-kernel_0_1_22-130-gbdf3aa8

[fabbione at sourceware.org]

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=bdf3aa8831d5689dbdeb3ad74c6b5326ceddc5eb

The branch, master has been updated
       via  bdf3aa8831d5689dbdeb3ad74c6b5326ceddc5eb (commit)
       via  fd7bce201861de1c3b1a047a93f1a76da284f2bc (commit)
      from  6719f1e1eb9a1543c53721f201befec081b4b78d (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 bdf3aa8831d5689dbdeb3ad74c6b5326ceddc5eb
Author: Andrew Price <andy at andrewprice.me.uk>
Date:   Tue Apr 8 22:48:05 2008 +0200

    [[BUILD] Warn and continue if CONFIG_KERNELVERSION is not found
    
    Currently the configure script assumes that CONFIG_KERNELVERSION is defined in
    autoconf.h. This patch handles the case where it isn't defined there.
    
    Signed-off-by: Andrew Price <andy at andrewprice.me.uk>
    Signed-off-by: Fabio M. Di Nitto <fabbione at fabbione.net>

commit fd7bce201861de1c3b1a047a93f1a76da284f2bc
Author: Fabio M. Di Nitto <fabbione at fabbione.net>
Date:   Tue Apr 8 22:46:19 2008 +0200

    [BUILD] Fix clean target for experimental fence/agents/lib
    
    Signed-off-by: Fabio M. Di Nitto <fabbione at fabbione.net>

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

Summary of changes:
 configure                 |    5 +++++
 fence/agents/lib/Makefile |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 4be68df..451c777 100755
--- a/configure
+++ b/configure
@@ -268,6 +268,11 @@ sub kernel_version {
       }
     }
     close AUTOCONF;
+    # Warn and continue if CONFIG_KERNELVERSION was not found
+    if (!$current_version) {
+	print " WARNING: Could not determine kernel version.\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/;
diff --git a/fence/agents/lib/Makefile b/fence/agents/lib/Makefile
index 4ef2edc..c66c83c 100644
--- a/fence/agents/lib/Makefile
+++ b/fence/agents/lib/Makefile
@@ -19,6 +19,6 @@ TARGET= fencing.py
 
 FENCELIB= $(TARGET)
 
-include $(OBJDIR)/make/fencebuild.mk
-
 endif
+
+include $(OBJDIR)/make/fencebuild.mk


hooks/post-receive
--
Cluster Project