Use ARCH in preference to uname -m when building kernel modules

* When building the kernel module, use the setting of the ARCH
  environment or make variable, if present, in preference to uname -m to
  allow cross-compiles.  Thanks, Jose Calhariz.  (Closes: #492232)

diff --git a/debian/changelog b/debian/changelog
index 5a642ff9f3da2c7d87568ac611674fe4a2f2985f..edf6996cd8829e6f960da29c90b14aafdd214a20 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ openafs (1.4.7.dfsg1-5) unstable; urgency=low
     and builds without UCONTEXT fail.  The binaries we were building
     before didn't work and no one reported a bug, indicating no one was
     attempting to use OpenAFS on hppa.
+  * When building the kernel module, use the setting of the ARCH
+    environment or make variable, if present, in preference to uname -m to
+    allow cross-compiles.  Thanks, Jose Calhariz.  (Closes: #492232)
   * Add Jason Edgecomb's copyright and license for man pages to
     debian/copyright.
 

diff --git a/debian/module/rules b/debian/module/rules
index 99a2da166042117bd0c11c5785152a4cdd112454..6329f67100cb12eaaa10c00f2357b94677cacf0e 100755 (executable)
--- a/debian/module/rules
+++ b/debian/module/rules
@@ -41,7 +41,8 @@ export KSRC
 export KVERS
 export KPKG_DEST_DIR
 
-SYS_NAME  := $(shell KSRC="$(KSRC)" KVERS="$(KVERS)" sh debian/sysname)
+SYS_NAME  := $(shell KSRC="$(KSRC)" KVERS="$(KVERS)" ARCH="$(ARCH)" \
+               sh debian/sysname)
 
 package    = openafs
 modulepkg := openafs-modules-$(KVERS)${INT_SUBARCH}

diff --git a/debian/module/sysname b/debian/module/sysname
index c745af6afcb40014baec29e10926afecdd92f0f3..288f408e28aea944cb0303f127c9298d485aa4c1 100755 (executable)
--- a/debian/module/sysname
+++ b/debian/module/sysname
@@ -7,7 +7,7 @@ if [ x"$KVERS" = x ] ; then
     exit 1
 fi
 
-case `uname -m` in
+case ${ARCH:-`uname -m`} in
 alpha)
     case $KVERS in
     2.2*)