* Use dpkg --print-architecture to determine the AFS sysname for both

  regular builds (avoiding --print-installation-architecture, which is
  deprecated) and kernel builds (avoiding arch, which is temporarily not
  in unstable and which wouldn't do the right thing for cross-compiles).
* Add hppa as a recognized architecture for kernel module builds,
  although OpenAFS currently only supports 2.4 kernels on HPPA so this
  isn't that useful.

diff --git a/debian/changelog b/debian/changelog
index 1990b9e22a08d32b1dc708c4ab74962016c86b66..054ebb5806b8984e00b05daf0fe33b4485d63dcc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openafs (1.4.4.dfsg1-6) unstable; urgency=low
+
+  * Use dpkg --print-architecture to determine the AFS sysname for both
+    regular builds (avoiding --print-installation-architecture, which is
+    deprecated) and kernel builds (avoiding arch, which is temporarily not
+    in unstable and which wouldn't do the right thing for cross-compiles).
+  * Add hppa as a recognized architecture for kernel module builds,
+    although OpenAFS currently only supports 2.4 kernels on HPPA so this
+    isn't that useful.
+
+ -- Russ Allbery <rra@debian.org>  Thu, 02 Aug 2007 19:50:16 -0700
+
 openafs (1.4.4.dfsg1-5) unstable; urgency=low
 
   * Apply upstream patch from Jeffrey Hutzelman to fix syscall probing on

diff --git a/debian/kern-sysname b/debian/kern-sysname
index 56d1f69f2ea0aa59928ae90c5fab751cc24a0dab..cdb96923eb8cf1e2b4c75defa7810828bf4c7056 100644 (file)
--- a/debian/kern-sysname
+++ b/debian/kern-sysname
@@ -7,21 +7,21 @@ if [ x"$KVERS" = x ] ; then
     exit 1
 fi
 
-case `arch` in
-i[3456]86)
+case `dpkg --print-architecture` in
+alpha)
     case $KVERS in
     2.2*)
-        echo i386_linux22
+        echo alpha_linux_22
         ;;
     2.4*)
-        echo i386_linux24
+        echo alpha_linux_24
         ;;
     2.6*)
-        echo i386_linux26
+        echo alpha_linux_26
         ;;
     esac
     ;;
-x86_64)
+amd64)
     case $KVERS in
     2.4*)
         echo amd64_linux24
@@ -31,53 +31,37 @@ x86_64)
         ;;
     esac
     ;;
-ia64)
+hppa)
     case $KVERS in
     2.4*)
-        echo ia64_linux24
-        ;;
-    2.6*)
-        echo ia64_linux26
+        echo parisc_linux24
         ;;
     esac
     ;;
-alpha)
+i[3456]86)
     case $KVERS in
     2.2*)
-        echo alpha_linux_22
+        echo i386_linux22
         ;;
     2.4*)
-        echo alpha_linux_24
+        echo i386_linux24
         ;;
     2.6*)
-        echo alpha_linux_26
-        ;;
-    esac
-    ;;
-sparc)
-    case $KVERS in
-    2.2*)
-        echo sparc_linux22
-        ;;
-    2.4*)
-        echo sparc_linux24
+        echo i386_linux26
         ;;
     esac
     ;;
-sparc64)
+ia64)
     case $KVERS in
-    2.2*)
-        echo sparc64_linux22
-        ;;
     2.4*)
-        echo sparc64_linux24
+        echo ia64_linux24
         ;;
     2.6*)
-        echo sparc64_linux26
+        echo ia64_linux26
         ;;
     esac
     ;;
-ppc)
+powerpc)
     case $KVERS in
     2.2*)
         echo ppc_linux22
@@ -120,6 +104,29 @@ s390x)
         ;;
     esac
     ;;
+sparc)
+    case $KVERS in
+    2.2*)
+        echo sparc_linux22
+        ;;
+    2.4*)
+        echo sparc_linux24
+        ;;
+    esac
+    ;;
+sparc64)
+    case $KVERS in
+    2.2*)
+        echo sparc64_linux22
+        ;;
+    2.4*)
+        echo sparc64_linux24
+        ;;
+    2.6*)
+        echo sparc64_linux26
+        ;;
+    esac
+    ;;
 *)
     echo "ERROR: unsupported architecture" >&2
     echo UNKNOWN

diff --git a/debian/sysname b/debian/sysname
index 0c529a7b42a8e43845a6ba8b7dbce72f38574422..c95bb0bacd18315edf64962347d5110e5863e2a1 100755 (executable)
--- a/debian/sysname
+++ b/debian/sysname
@@ -5,7 +5,7 @@
 #
 # Not all architectures are listed, only those that OpenAFS supports.
 
-case `dpkg --print-installation-architecture` in
+case `dpkg --print-architecture` in
 alpha)
     echo alpha_linux_26
     ;;