* 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 89c9446bef244743bb9719c35f07116a431b8e79..027d63f71cbc10b2d5213ad1a8a0469ebaf2b03c 100644 (file)
--- 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 1aa0293a033488c084a3c8ea266e2d74a7bba3f1..cadab28fbb5f1ec9fee87e7240afc0a38ceabaaa 100644 (file)
--- 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