From: Russ Allbery <rra@debian.org>
Date: Fri, 3 Aug 2007 02:49:40 +0000 (+0000)
Subject: * Use dpkg --print-architecture to determine the AFS sysname for both
X-Git-Tag: debian/1.4.4.dfsg1-6~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f818c4026055e807a29b1df8541b52638b4753c0;p=packages%2Fo%2Fopenafs.git

* 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 1990b9e22..054ebb580 100644
--- 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 56d1f69f2..cdb96923e 100644
--- 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 0c529a7b4..c95bb0bac 100755
--- 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
     ;;