Add support for armhf

diff --git a/debian/control b/debian/control
index 7d6963a73490c243e8faaa3b136b50643b626f31..2e358939e6bdeeb42184955ea52ac55daa829849 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/git/pkg-k5-afs/openafs.git
 Vcs-Browser: http://git.debian.org/?p=pkg-k5-afs/openafs.git
 
 Package: openafs-client
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: lsof, openafs-modules-dkms (>= ${source:Version})
  | openafs-modules-source (>= ${source:Version})
@@ -32,7 +32,7 @@ Description: AFS distributed filesystem client support
 
 Package: openafs-fuse
 Priority: extra
-Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 lpia powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends},
  openafs-client (= ${binary:Version})
 Description: AFS distributed file system experimental FUSE client
@@ -48,7 +48,7 @@ Description: AFS distributed file system experimental FUSE client
 
 Package: openafs-kpasswd
 Priority: extra
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends},
  openafs-client (= ${binary:Version})
 Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients
@@ -63,7 +63,7 @@ Description: AFS distributed filesystem old password changing
  package for new cells or for cells using Kerberos v5.
 
 Package: openafs-fileserver
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client, lsb-base
 Recommends: ntp | time-daemon
 Suggests: openafs-doc
@@ -76,7 +76,7 @@ Description: AFS distributed filesystem file server
  installed on any machine that will export files into AFS.
 
 Package: openafs-dbserver
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends},
  openafs-fileserver, openafs-client (= ${binary:Version})
 Suggests: openafs-doc
@@ -103,7 +103,7 @@ Description: AFS distributed filesystem documentation
  protocol documentation, and other OpenAFS documentation.
 
 Package: openafs-krb5
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: openafs-client (<< 1.4.7.dfsg1-1)
 Description: AFS distributed filesystem Kerberos 5 integration
@@ -118,7 +118,7 @@ Description: AFS distributed filesystem Kerberos 5 integration
 
 Package: libkopenafs1
 Section: libs
-Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 lpia powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: AFS distributed file system runtime library (PAGs)
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -131,7 +131,7 @@ Description: AFS distributed file system runtime library (PAGs)
 
 Package: libafsauthent1
 Section: libs
-Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 lpia powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: AFS distributed file system runtime library (authentication)
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -143,7 +143,7 @@ Description: AFS distributed file system runtime library (authentication)
 
 Package: libafsrpc1
 Section: libs
-Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 lpia powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: AFS distributed file system runtime library (RPC layer)
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -156,7 +156,7 @@ Description: AFS distributed file system runtime library (RPC layer)
 Package: libopenafs-dev
 Section: libdevel
 Priority: extra
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libafsauthent1 (= ${binary:Version}), libafsrpc1 (= ${binary:Version}),
  libkopenafs1 (= ${binary:Version}),
@@ -200,7 +200,7 @@ Description: AFS distributed filesystem kernel module DKMS source
  approriate configuration for DKMS to build new modules dynamically.
 
 Package: libpam-openafs-kaserver
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Section: admin
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -218,7 +218,7 @@ Description: AFS distributed filesystem kaserver PAM module
 Package: openafs-dbg
 Section: debug
 Priority: extra
-Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${misc:Depends}, openafs-fileserver (= ${binary:Version})
  | openafs-dbserver (= ${binary:Version})
 Description: AFS distributed filesystem debugging information

diff --git a/debian/module/sysname b/debian/module/sysname
index 3762999a7eb4760fb95040e75cce22114345554a..b686ae88f0bd9aa46a95968db23dd653629640a8 100755 (executable)
--- a/debian/module/sysname
+++ b/debian/module/sysname
@@ -21,7 +21,7 @@ alpha)
         ;;
     esac
     ;;
-arm|armel|armv5tel)
+arm|armel|armhf|armv5tel)
     case $KVERS in
     2.4*)
         echo arm_linux24

diff --git a/debian/rules b/debian/rules
index 7b17d050db526c2347547781bdf01a63a0c1062a..446359488d1b8e72bd5e2ee7c7557e96a20450f1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp
     DEBIAN_KERN_FLAGS = --disable-optimize-kernel
-else ifeq (arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE))
+else ifneq (,$(findstring arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE)))
     DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp
     DEBIAN_KERN_FLAGS = --disable-optimize-kernel
 else

diff --git a/debian/sysname b/debian/sysname
index 48271272639f5c3ddbd4ca94f658caf119c85a8b..f6b2a517114186c35e85c04f6463f752504b3693 100755 (executable)
--- a/debian/sysname
+++ b/debian/sysname
@@ -9,7 +9,7 @@ case `dpkg --print-architecture` in
 alpha)
     echo alpha_linux_26
     ;;
-arm|armel|armv5tel)
+arm|armel|armhf|armv5tel)
     echo arm_linux26
     ;;
 amd64)

diff --git a/src/packaging/Debian/module/sysname b/src/packaging/Debian/module/sysname
index 3762999a7eb4760fb95040e75cce22114345554a..b686ae88f0bd9aa46a95968db23dd653629640a8 100755 (executable)
--- a/src/packaging/Debian/module/sysname
+++ b/src/packaging/Debian/module/sysname
@@ -21,7 +21,7 @@ alpha)
         ;;
     esac
     ;;
-arm|armel|armv5tel)
+arm|armel|armhf|armv5tel)
     case $KVERS in
     2.4*)
         echo arm_linux24

diff --git a/src/packaging/Debian/sysname b/src/packaging/Debian/sysname
index 48271272639f5c3ddbd4ca94f658caf119c85a8b..f6b2a517114186c35e85c04f6463f752504b3693 100755 (executable)
--- a/src/packaging/Debian/sysname
+++ b/src/packaging/Debian/sysname
@@ -9,7 +9,7 @@ case `dpkg --print-architecture` in
 alpha)
     echo alpha_linux_26
     ;;
-arm|armel|armv5tel)
+arm|armel|armhf|armv5tel)
     echo arm_linux26
     ;;
 amd64)