From: Russ Allbery <rra@debian.org>
Date: Mon, 16 Apr 2007 01:10:13 +0000 (+0000)
Subject: * When determining the AFS sysname for kernel module builds, add
X-Git-Tag: debian/1.4.4.dfsg1-2~8
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ef9107bde9ea5e4f5d7023a894a1ff81ffae3c73;p=packages%2Fo%2Fopenafs.git

* When determining the AFS sysname for kernel module builds, add
  explicit cases for 2.6 kernels for all architectures that support them
  (everything except non-64-bit sparc_linux).  Fixes build problems with
  ia64 and probably other architectures.  Thanks to Ippokratis Pandis
  for the debugging help.  (Closes: #411818)
---

diff --git a/debian/changelog b/debian/changelog
index 89c9446be..027d63f71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 openafs (1.4.4.dfsg1-2) unstable; urgency=low
 
+  * When determining the AFS sysname for kernel module builds, add
+    explicit cases for 2.6 kernels for all architectures that support them
+    (everything except non-64-bit sparc_linux).  Fixes build problems with
+    ia64 and probably other architectures.  Thanks to Ippokratis Pandis
+    for the debugging help.  (Closes: #411818)
   * Fix the watch file to remove .dfsg\d+ when comparing versions.
 
  --
diff --git a/debian/kern-sysname b/debian/kern-sysname
index 1aa0293a0..cadab28fb 100644
--- a/debian/kern-sysname
+++ b/debian/kern-sysname
@@ -32,7 +32,14 @@ x86_64)
     esac
     ;;
 ia64)
-    echo ia64_linux24
+    case $KVERS in
+    2.4*)
+        echo ia64_linux24
+        ;;
+    2.6*)
+        echo ia64_linux24
+        ;;
+    esac
     ;;
 alpha)
     case $KVERS in
@@ -42,6 +49,9 @@ alpha)
     2.4*)
         echo alpha_linux_24
         ;;
+    2.6*)
+        echo alpha_linux_26
+        ;;
     esac
     ;;
 sparc)
@@ -62,6 +72,9 @@ sparc64)
     2.4*)
         echo sparc64_linux24
         ;;
+    2.6*)
+        echo sparc64_linux26
+        ;;
     esac
     ;;
 ppc)
@@ -88,7 +101,14 @@ ppc64)
     esac
     ;;
 s390)
-    echo s390_linux24
+    case $KVERS in
+    2.4*)
+        echo s390_linux24
+        ;;
+    2.6*)
+        echo s390_linux26
+        ;;
+    esac
     ;;
 *)
     echo "ERROR: unsupported architecture" >&2