From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
Date: 22 Feb 2007 16:20:53 -0000
Subject: [Cluster-devel] cluster cman-kernel/configure cmirror-kernel/c ...
Message-ID: <20070222162053.23653.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
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
Branch: 	STABLE
Changes by:	rpeterso at sourceware.org	2007-02-22 16:20:50

Modified files:
	cman-kernel    : configure 
	cmirror-kernel : configure 
	dlm-kernel     : configure 
	gfs-kernel     : configure 
	gnbd/scripts   : linuxver 
	gnbd-kernel    : configure 

Log message:
	Fix configure scripts so they figure out the correct kernel
	version and module install location on newer kernels.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman-kernel/configure.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.3&r2=1.3.8.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/configure.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.4.1&r2=1.1.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/configure.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.3&r2=1.3.8.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/configure.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.3&r2=1.3.8.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/scripts/linuxver.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1&r2=1.1.8.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/configure.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.3&r2=1.3.8.1

--- cluster/cman-kernel/Attic/configure	2004/09/01 18:43:58	1.3
+++ cluster/cman-kernel/Attic/configure	2007/02/22 16:20:48	1.3.8.1
@@ -92,7 +92,7 @@
 
 print OFILE "# This file was generated by configure from defines.mk.input\n";
 
-open VER, "<$kernel_src/include/linux/version.h" or die "Can't open $kernel_src/include/linux/version.h";
+open VER, "<$kernel_src/include/linux/utsrelease.h" or die "Can't open $kernel_src/include/linux/utsrelease.h";
 while(<VER>){
     chomp;
     if( $_ =~ /^#define\s*UTS_RELEASE\s*\"(.*)\"$/ ){
--- cluster/cmirror-kernel/Attic/configure	2006/06/27 18:36:08	1.1.4.1
+++ cluster/cmirror-kernel/Attic/configure	2007/02/22 16:20:48	1.1.4.2
@@ -92,7 +92,7 @@
 
 print OFILE "# This file was generated by configure from defines.mk.input\n";
 
-open VER, "<$kernel_src/include/linux/version.h" or die "Can't open $kernel_src/include/linux/version.h";
+open VER, "<$kernel_src/include/linux/utsrelease.h" or die "Can't open $kernel_src/include/linux/utsrelease.h";
 while(<VER>){
     chomp;
     if( $_ =~ /^#define\s*UTS_RELEASE\s*\"(.*)\"$/ ){
--- cluster/dlm-kernel/Attic/configure	2004/09/01 18:43:59	1.3
+++ cluster/dlm-kernel/Attic/configure	2007/02/22 16:20:49	1.3.8.1
@@ -92,7 +92,7 @@
 
 print OFILE "# This file was generated by configure from defines.mk.input\n";
 
-open VER, "<$kernel_src/include/linux/version.h" or die "Can't open $kernel_src/include/linux/version.h";
+open VER, "<$kernel_src/include/linux/utsrelease.h" or die "Can't open $kernel_src/include/linux/utsrelease.h";
 while(<VER>){
     chomp;
     if( $_ =~ /^#define\s*UTS_RELEASE\s*\"(.*)\"$/ ){
--- cluster/gfs-kernel/configure	2004/09/01 18:43:59	1.3
+++ cluster/gfs-kernel/configure	2007/02/22 16:20:49	1.3.8.1
@@ -92,7 +92,7 @@
 
 print OFILE "# This file was generated by configure from defines.mk.input\n";
 
-open VER, "<$kernel_src/include/linux/version.h" or die "Can't open $kernel_src/include/linux/version.h";
+open VER, "<$kernel_src/include/linux/utsrelease.h" or die "Can't open $kernel_src/include/linux/utsrelease.h";
 while(<VER>){
     chomp;
     if( $_ =~ /^#define\s*UTS_RELEASE\s*\"(.*)\"$/ ){
--- cluster/gnbd/scripts/linuxver	2004/06/24 08:53:33	1.1
+++ cluster/gnbd/scripts/linuxver	2007/02/22 16:20:50	1.1.8.1
@@ -37,11 +37,11 @@
 
     # if there was an argument to linuxver, use it as the linux source directory
     if ($linux_src) {
-      $file = $linux_src . '/include/linux/version.h';
+      $file = $linux_src . '/include/linux/utsrelease.h';
     }
     # otherwise, use the default 
     else {
-       $file = '/usr/src/linux/include/linux/version.h';
+       $file = '/usr/src/linux/include/linux/utsrelease.h';
     }
       
 
--- cluster/gnbd-kernel/configure	2004/09/01 18:43:59	1.3
+++ cluster/gnbd-kernel/configure	2007/02/22 16:20:50	1.3.8.1
@@ -92,7 +92,7 @@
 
 print OFILE "# This file was generated by configure from defines.mk.input\n";
 
-open VER, "<$kernel_src/include/linux/version.h" or die "Can't open $kernel_src/include/linux/version.h";
+open VER, "<$kernel_src/include/linux/utsrelease.h" or die "Can't open $kernel_src/include/linux/utsrelease.h";
 while(<VER>){
     chomp;
     if( $_ =~ /^#define\s*UTS_RELEASE\s*\"(.*)\"$/ ){