From 9e0002e1661dbf7cec566ef57ac2021700b75a73 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 14 Jun 2010 18:13:02 -0700 Subject: [PATCH] Drop support for lpia, add powerpcspe --- debian/changelog | 5 +++++ debian/control | 20 ++++++++++---------- debian/module/sysname | 2 +- debian/sysname | 4 ++-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index bbd167f03..248a6a23a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ openafs (1.4.12.1+dfsg-2) UNRELEASED; urgency=low * Apply upstream deltas to fix crashes in the file server: - [f9e1b702] Do not use AFS_PTR_FMT or %p in 1.4 + * Remove the lpia architecture. This was an experiment in Ubuntu that + has apparently been dropped. + * Add preliminary support for powerpcspe, mapping that architecture to + ppc_linux26. The kernel build won't work unless uname -m on that + architecture returns ppc. -- Russ Allbery Mon, 14 Jun 2010 17:56:05 -0700 diff --git a/debian/control b/debian/control index eda2262bd..fde7a2238 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,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 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel 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}) @@ -30,7 +30,7 @@ Description: AFS distributed filesystem client support Package: openafs-kpasswd Priority: extra -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients Description: AFS distributed filesystem old password changing @@ -44,7 +44,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 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client, lsb-base Recommends: ntp | time-daemon Suggests: openafs-doc @@ -57,7 +57,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 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, openafs-fileserver, openafs-client Suggests: openafs-doc @@ -86,7 +86,7 @@ Description: AFS distributed filesystem documentation protocol documentation, and other OpenAFS documentation. Package: openafs-krb5 -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: openafs-client (<< 1.4.7.dfsg1-1) Description: AFS distributed filesystem Kerberos 5 integration @@ -101,7 +101,7 @@ Description: AFS distributed filesystem Kerberos 5 integration Package: libopenafs-dev Section: libdevel -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: openafs-doc @@ -117,7 +117,7 @@ Description: AFS distributed filesystem development libraries Package: openafs-modules-source Section: kernel Priority: extra -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${misc:Depends}, bison, flex, debhelper (>= 5), module-assistant | kernel-package Description: AFS distributed filesystem kernel module source @@ -132,7 +132,7 @@ Package: openafs-modules-dkms Section: kernel Priority: extra Depends: ${misc:Depends}, dkms, bison, flex -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Description: AFS distributed filesystem kernel module DKMS source AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -142,7 +142,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 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Section: admin Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client @@ -159,7 +159,7 @@ Description: AFS distributed filesystem kaserver PAM module Package: openafs-dbg Section: debug Priority: extra -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel 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 9a75e80e1..3762999a7 100755 --- a/debian/module/sysname +++ b/debian/module/sysname @@ -31,7 +31,7 @@ arm|armel|armv5tel) ;; esac ;; -i[3456]86|lpia) +i[3456]86) case $KVERS in 2.2*) echo i386_linux22 diff --git a/debian/sysname b/debian/sysname index da8fd1a5f..482712726 100755 --- a/debian/sysname +++ b/debian/sysname @@ -15,13 +15,13 @@ arm|armel|armv5tel) amd64) echo amd64_linux26 ;; -i[3456]86|lpia) +i[3456]86) echo i386_linux26 ;; ia64) echo ia64_linux26 ;; -powerpc) +powerpc|powerpcspe) echo ppc_linux26 ;; ppc64) -- 2.39.5