From: Russ Allbery <rra@debian.org>
Date: Sat, 10 Nov 2007 03:48:47 +0000 (+0000)
Subject: * Use uname -m rather than dpkg --print-architecture to determine the
X-Git-Tag: debian/1.4.5.dfsg1-1~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=03336718f7e488024fa02f6c73de67650b26ddb8;p=packages%2Fo%2Fopenafs.git

* Use uname -m rather than dpkg --print-architecture to determine the
  sysname for kernel module builds.  Otherwise, builds with a different
  kernel architecture than userspace (amd64 kernels with i386 userspace,
  for example) don't work.  Thanks, Anders Kaseorg.  (Closes: #448452)
---

diff --git a/debian/changelog b/debian/changelog
index 232d2959b..f5c506f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,16 @@ openafs (1.4.5.dfsg1-1) unstable; urgency=low
     - Even with a new enough Linux kernel to support keyrings, we still
       may have found the system call table and need to clean it up when
       unloading the module.  (Closes: #448793)
+  * Use uname -m rather than dpkg --print-architecture to determine the
+    sysname for kernel module builds.  Otherwise, builds with a different
+    kernel architecture than userspace (amd64 kernels with i386 userspace,
+    for example) don't work.  Thanks, Anders Kaseorg.  (Closes: #448452)
   * Fix signing the generated the changes file on a kernel module build.
     The module build file reorganization required an additional change to
     genchanges.  Thanks, Anders Kaseorg.  (Closes: #448449)
   * Expose prototypes for the ktc_* functions.  (Closes: #449432)
 
- -- Russ Allbery <rra@debian.org>  Fri, 09 Nov 2007 19:40:11 -0800
+ -- Russ Allbery <rra@debian.org>  Fri, 09 Nov 2007 19:51:31 -0800
 
 openafs (1.4.5~pre2.dfsg1-1) unstable; urgency=low
 
diff --git a/debian/module/sysname b/debian/module/sysname
index cdb96923e..d551c89dd 100755
--- a/debian/module/sysname
+++ b/debian/module/sysname
@@ -7,7 +7,7 @@ if [ x"$KVERS" = x ] ; then
     exit 1
 fi
 
-case `dpkg --print-architecture` in
+case `uname -m` in
 alpha)
     case $KVERS in
     2.2*)
@@ -21,16 +21,6 @@ alpha)
         ;;
     esac
     ;;
-amd64)
-    case $KVERS in
-    2.4*)
-        echo amd64_linux24
-        ;;
-    2.6*)
-        echo amd64_linux26
-        ;;
-    esac
-    ;;
 hppa)
     case $KVERS in
     2.4*)
@@ -61,7 +51,7 @@ ia64)
         ;;
     esac
     ;;
-powerpc)
+ppc)
     case $KVERS in
     2.2*)
         echo ppc_linux22
@@ -127,6 +117,16 @@ sparc64)
         ;;
     esac
     ;;
+x86_64)
+    case $KVERS in
+    2.4*)
+        echo amd64_linux24
+        ;;
+    2.6*)
+        echo amd64_linux26
+        ;;
+    esac
+    ;;
 *)
     echo "ERROR: unsupported architecture" >&2
     echo UNKNOWN