From: Russ Allbery <rra@stanford.edu>
Date: Tue, 7 Jul 2009 00:19:26 +0000 (-0700)
Subject: Search for the Linux version in the correct header
X-Git-Tag: openafs-stable-1_4_12pre1~76
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=59a386fcd43ce93d425e40136cea04fe7fce7dd1;p=packages%2Fo%2Fopenafs.git

Search for the Linux version in the correct header

src/config/linux-version already had support for handling either versioned
or unversioned kernel source directories, but the grep for UTS_RELEASE
was unconditionally done against the versioned source tree, ignoring the
previous determination of where the header file was.

Instead, check instead the header file location that we'd previously
determined.

This patch has been tested in the Debian OpenAFS 1.4.11~pre3+dfsg-1
package.

Reviewed-on: http://gerrit.openafs.org/4
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Verified-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit ecd3fc42d1d6dca23bb2e2728a0066d3db8eceb6)
Change-Id: I286109d139320f7ce71c5d5265bc3e4a2fca4945
Reviewed-on: http://gerrit.openafs.org/924
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/config/linux-version b/src/config/linux-version
index caa7b253d..800b01e0e 100644
--- a/src/config/linux-version
+++ b/src/config/linux-version
@@ -57,7 +57,7 @@ for VERS in $LINUX_VERS ; do
 	    fi
 	fi
 
-	vers=`fgrep UTS_RELEASE $LINUX_SRCDIR$VERS/include/linux/version.h |
+	vers=`fgrep UTS_RELEASE "$header" |
 		awk 'BEGIN { FS="\"" } { print $2 }'`
 	if [ "x$vers" = "x" ] ; then
 	    echo "ERROR: Cannot build for Linux kernel $VERS:"