From: Russ Allbery <rra@debian.org>
Date: Sat, 4 Jul 2009 21:31:19 +0000 (-0700)
Subject: Bring src/config/linux-version closer to upstream
X-Git-Tag: debian/1.4.11.pre3+dfsg-1~3
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e2762a8ac2b1ef7405a0e186c95764b7b4fd1889;p=packages%2Fo%2Fopenafs.git

Bring src/config/linux-version closer to upstream

* Bring src/config/linux-version closer to upstream since upstream now
  handles unversioned source directories.  There is one remaining change
  required to search for UTS_RELEASE in the correct header path.
---

diff --git a/debian/changelog b/debian/changelog
index 334eae9cc..53f0f70f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ openafs (1.4.11~pre3+dfsg-1) UNRELEASED; urgency=low
     openafs-modules-dkms package.  In the possible cases where the tree
     may not be present to be removed, failing package removal doesn't
     make sense.  (Further addresses LP #368471.)
+  * Bring src/config/linux-version closer to upstream since upstream now
+    handles unversioned source directories.  There is one remaining change
+    required to search for UTS_RELEASE in the correct header path.
   * Translation updates:
     - Russian, thanks Yuri Kozlov.  (Closes: #534807)
 
diff --git a/src/config/linux-version b/src/config/linux-version
index ebc8437a6..800b01e0e 100644
--- a/src/config/linux-version
+++ b/src/config/linux-version
@@ -38,7 +38,7 @@ found_one="false"
 CAN_BUILD=""
 
 for VERS in $LINUX_VERS ; do
-	dir=$LINUX_SRCDIR
+	dir=$LINUX_SRCDIR$VERS
 	if [ ! -d $dir ] ; then
 	    dir=$LINUX_SRCDIR
 	    if [ ! -d $dir ] ; then
@@ -47,7 +47,7 @@ for VERS in $LINUX_VERS ; do
 		continue
       	    fi
 	fi
-	header=$LINUX_SRCDIR/include/linux/version.h
+	header=$LINUX_SRCDIR$VERS/include/linux/version.h
 	if [ ! -f $header ] ; then
 	    header=$LINUX_SRCDIR/include/linux/version.h
 	    if [ ! -f $header ] ; then
@@ -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:"