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 334eae9cc75c2008b386b9fc1f68f23fe249a8d8..53f0f70f7ffeb985ef5c211f576100fb10ec69e6 100644 (file)
--- 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 ebc8437a6c517d46302dac36fe7af647e548324c..800b01e0e2e2e0fc50b1f51eb9d5b6354c2871b9 100644 (file)
--- 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:"