From a4e9365fff2b0e3daf7e9cf2b40e6027b7dd3a15 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Sun, 1 Dec 2019 15:27:01 -0600 Subject: [PATCH] FBSD: Remove support for 8.x and 9.x According to , FreeBSD 8.x EoL was on August 1, 2015, and FreeBSD 9.x EoL was on December 31, 2016. Remove our support for these versions, since they haven't been supported by FreeBSD itself for a while. FreeBSD 10.x EoL was on October 31, 2018, which has passed, but was less than a year ago. So keep 10.x in for now. Adjust our preprocessor checks accordingly: - In FBSD-specific dirs, assume AFS_FBSD100_ENV and lower is always true. Assume __FreeBSD_version is always at least 1000000. - In non-FBSD dirs, convert AFS_FBSD100_ENV and lower to AFS_FBSD_ENV. Change-Id: I965e65d3b95573bb374661217b24b686c7b68ed2 Reviewed-on: https://gerrit.openafs.org/13842 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- INSTALL | 9 +++--- src/afs/FBSD/osi_file.c | 4 +-- src/afs/FBSD/osi_groups.c | 13 -------- src/afs/FBSD/osi_vfsops.c | 34 +++----------------- src/afs/FBSD/osi_vnodeops.c | 7 ---- src/afs/afs_pioctl.c | 6 +--- src/afs/afs_prototypes.h | 3 -- src/afsweb/apache_includes/1.2/conf.h | 3 +- src/afsweb/apache_includes/1.3.1/ap_config.h | 3 +- src/afsweb/apache_includes/1.3.6/ap_config.h | 3 +- src/afsweb/apache_includes/conf.h | 3 +- src/config/param.amd64_fbsd_100.h | 30 ----------------- src/config/param.amd64_fbsd_101.h | 27 ---------------- src/config/param.amd64_fbsd_102.h | 27 ---------------- src/config/param.amd64_fbsd_103.h | 27 ---------------- src/config/param.amd64_fbsd_104.h | 27 ---------------- src/config/param.amd64_fbsd_110.h | 27 ---------------- src/config/param.amd64_fbsd_111.h | 27 ---------------- src/config/param.amd64_fbsd_112.h | 27 ---------------- src/config/param.amd64_fbsd_120.h | 27 ---------------- src/config/param.amd64_fbsd_80.h | 21 ------------ src/config/param.amd64_fbsd_81.h | 27 ---------------- src/config/param.amd64_fbsd_82.h | 30 ----------------- src/config/param.amd64_fbsd_83.h | 33 ------------------- src/config/param.amd64_fbsd_84.h | 36 --------------------- src/config/param.amd64_fbsd_90.h | 39 ---------------------- src/config/param.amd64_fbsd_91.h | 42 ------------------------ src/config/param.amd64_fbsd_92.h | 45 -------------------------- src/config/param.amd64_fbsd_93.h | 48 ---------------------------- src/config/param.i386_fbsd_100.h | 30 ----------------- src/config/param.i386_fbsd_101.h | 27 ---------------- src/config/param.i386_fbsd_102.h | 27 ---------------- src/config/param.i386_fbsd_103.h | 27 ---------------- src/config/param.i386_fbsd_104.h | 27 ---------------- src/config/param.i386_fbsd_110.h | 27 ---------------- src/config/param.i386_fbsd_111.h | 27 ---------------- src/config/param.i386_fbsd_112.h | 27 ---------------- src/config/param.i386_fbsd_120.h | 27 ---------------- src/config/param.i386_fbsd_80.h | 19 ----------- src/config/param.i386_fbsd_81.h | 25 --------------- src/config/param.i386_fbsd_82.h | 28 ---------------- src/config/param.i386_fbsd_83.h | 31 ------------------ src/config/param.i386_fbsd_84.h | 34 -------------------- src/config/param.i386_fbsd_90.h | 37 --------------------- src/config/param.i386_fbsd_91.h | 40 ----------------------- src/config/param.i386_fbsd_92.h | 43 ------------------------- src/config/param.i386_fbsd_93.h | 46 -------------------------- src/rx/FBSD/rx_knet.c | 4 --- src/rx/rx_kernel.h | 2 +- 49 files changed, 16 insertions(+), 1194 deletions(-) delete mode 100644 src/config/param.amd64_fbsd_80.h delete mode 100644 src/config/param.amd64_fbsd_81.h delete mode 100644 src/config/param.amd64_fbsd_82.h delete mode 100644 src/config/param.amd64_fbsd_83.h delete mode 100644 src/config/param.amd64_fbsd_84.h delete mode 100644 src/config/param.amd64_fbsd_90.h delete mode 100644 src/config/param.amd64_fbsd_91.h delete mode 100644 src/config/param.amd64_fbsd_92.h delete mode 100644 src/config/param.amd64_fbsd_93.h delete mode 100644 src/config/param.i386_fbsd_80.h delete mode 100644 src/config/param.i386_fbsd_81.h delete mode 100644 src/config/param.i386_fbsd_82.h delete mode 100644 src/config/param.i386_fbsd_83.h delete mode 100644 src/config/param.i386_fbsd_84.h delete mode 100644 src/config/param.i386_fbsd_90.h delete mode 100644 src/config/param.i386_fbsd_91.h delete mode 100644 src/config/param.i386_fbsd_92.h delete mode 100644 src/config/param.i386_fbsd_93.h diff --git a/INSTALL b/INSTALL index e6c5fab..f45b95c 100644 --- a/INSTALL +++ b/INSTALL @@ -235,11 +235,10 @@ F OpenBSD Notes G FreeBSD Notes - The FreeBSD client supports FreeBSD 8.x and later, but does not receive - regular testing on versions older than FreeBSD 9.x at this time. Only - the amd64 and i386 architectures are supported, but it should not be - hard to port to other processors if they are already supported under - another operating system. + The FreeBSD client supports FreeBSD 10.x and later. Only the amd64 + and i386 architectures are supported, but it should not be hard to + port to other processors if they are already supported under another + operating system. You need kernel source installed to build OpenAFS. Use the --with-bsd-kernel-headers= configure option if your kernel source is diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c index 01e5993..00bbc8b 100644 --- a/src/afs/FBSD/osi_file.c +++ b/src/afs/FBSD/osi_file.c @@ -127,7 +127,7 @@ int afs_osi_Read(struct osi_file *afile, int offset, void *aptr, afs_int32 asize) { -#if (__FreeBSD_version >= 900505 && __FreeBSD_Version < 1000000) ||__FreeBSD_version >= 1000009 +#if __FreeBSD_version >= 1000009 ssize_t resid; #else int resid; @@ -172,7 +172,7 @@ int afs_osi_Write(struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize) { -#if (__FreeBSD_version >= 900505 && __FreeBSD_Version < 1000000) ||__FreeBSD_version >= 1000009 +#if __FreeBSD_version >= 1000009 ssize_t resid; #else int resid; diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c index 421a085..6326f6c 100644 --- a/src/afs/FBSD/osi_groups.c +++ b/src/afs/FBSD/osi_groups.c @@ -48,17 +48,9 @@ Afs_xsetgroups(struct thread *td, struct setgroups_args *uap) AFS_GUNLOCK(); crfree(cr); if (code) -#if (__FreeBSD_version >= 900044) return sys_setgroups(td, uap); /* afs has shut down */ -#else - return setgroups(td, uap); /* afs has shut down */ -#endif -#if (__FreeBSD_version >= 900044) code = sys_setgroups(td, uap); -#else - code = setgroups(td, uap); -#endif /* Note that if there is a pag already in the new groups we don't * overwrite it with the old pag. */ @@ -81,13 +73,8 @@ int setpag(struct thread *td, struct ucred **cred, afs_uint32 pagvalue, afs_uint32 * newpag, int change_parent) { -#if defined(AFS_FBSD81_ENV) gid_t *gidset; int gidset_len = ngroups_max + 1; -#else - gid_t *gidset; - int gidset_len = NGROUPS; /* 1024 */ -#endif int ngroups, code; int j; diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c index cd52055..4cfe39a 100644 --- a/src/afs/FBSD/osi_vfsops.c +++ b/src/afs/FBSD/osi_vfsops.c @@ -20,9 +20,6 @@ int afs_pbuf_freecnt = -1; extern int Afs_xsetgroups(); extern int afs_xioctl(); -#if !defined(AFS_FBSD90_ENV) && !defined(AFS_FBSD82_ENV) -static sy_call_t *old_handler; -#else static struct sysent old_sysent; static struct sysent afs_sysent = { @@ -32,60 +29,37 @@ static struct sysent afs_sysent = { NULL, /* systrace_args_funt_t sy_systrace_args_func */ 0, /* u_int32_t sy_entry */ 0, /* u_int32_t sy_return */ -# ifdef AFS_FBSD90_ENV 0, /* u_int32_t sy_flags */ 0 /* u_int32_t sy_thrcnt */ -# endif }; -#endif /* FBSD90 */ int afs_init(struct vfsconf *vfc) { int code; int offset = AFS_SYSCALL; -#if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV) -# if defined(FBSD_SYSCALL_REGISTER_FOUR_ARGS) +#if defined(FBSD_SYSCALL_REGISTER_FOUR_ARGS) code = syscall_register(&offset, &afs_sysent, &old_sysent, 0); -# else +#else code = syscall_register(&offset, &afs_sysent, &old_sysent); -# endif +#endif if (code) { printf("AFS_SYSCALL in use, error %i. aborting\n", code); return code; } -#else - if (sysent[AFS_SYSCALL].sy_call != (sy_call_t *)nosys - && sysent[AFS_SYSCALL].sy_call != (sy_call_t *)lkmnosys) { - printf("AFS_SYSCALL in use. aborting\n"); - return EBUSY; - } -#endif osi_Init(); afs_pbuf_freecnt = nswbuf / 2 + 1; -#if !defined(AFS_FBSD90_ENV) && !defined(AFS_FBSD82_ENV) - old_handler = sysent[AFS_SYSCALL].sy_call; - sysent[AFS_SYSCALL].sy_call = afs3_syscall; - sysent[AFS_SYSCALL].sy_narg = 5; -#endif return 0; } int afs_uninit(struct vfsconf *vfc) { -#if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV) int offset = AFS_SYSCALL; -#endif if (afs_globalVFS) return EBUSY; -#if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV) syscall_deregister(&offset, &old_sysent); -#else - sysent[AFS_SYSCALL].sy_narg = 0; - sysent[AFS_SYSCALL].sy_call = old_handler; -#endif return 0; } @@ -149,7 +123,7 @@ afs_mount(struct mount *mp) } static int -#if (__FreeBSD_version >= 900503 && __FreeBSD_version < 1000000) || __FreeBSD_version >= 1000004 +#if __FreeBSD_version >= 1000004 afs_cmount(struct mntarg *ma, void *data, uint64_t flags) #else afs_cmount(struct mntarg *ma, void *data, int flags) diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c index 32c627a..9297273 100644 --- a/src/afs/FBSD/osi_vnodeops.c +++ b/src/afs/FBSD/osi_vnodeops.c @@ -137,17 +137,10 @@ struct vop_vector afs_vnodeops = { * Here we define compatibility functions/macros for interfaces that * have changed between different FreeBSD versions. */ -#if defined(AFS_FBSD90_ENV) static __inline void ma_vm_page_lock_queues(void) {}; static __inline void ma_vm_page_unlock_queues(void) {}; static __inline void ma_vm_page_lock(vm_page_t m) { vm_page_lock(m); }; static __inline void ma_vm_page_unlock(vm_page_t m) { vm_page_unlock(m); }; -#else -static __inline void ma_vm_page_lock_queues(void) { vm_page_lock_queues(); }; -static __inline void ma_vm_page_unlock_queues(void) { vm_page_unlock_queues(); }; -static __inline void ma_vm_page_lock(vm_page_t m) {}; -static __inline void ma_vm_page_unlock(vm_page_t m) {}; -#endif #define ma_vn_lock(vp, flags, p) (vn_lock(vp, flags)) #define MA_VOP_LOCK(vp, flags, p) (VOP_LOCK(vp, flags)) diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 07a931b..c97d0f4 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -828,7 +828,7 @@ afs_xioctl(afs_proc_t *p, const struct ioctl_args *uap, register_t *retval) #if defined(AFS_NBSD50_ENV) if ((fd = fd_getfile(SCARG(uap, fd))) == NULL) return (EBADF); -#elif defined(AFS_FBSD100_ENV) +#elif defined(AFS_FBSD_ENV) if ((uap->fd >= fdp->fd_nfiles) || ((fd = fdp->fd_ofiles[uap->fd].fde_file) == NULL)) return EBADF; @@ -887,11 +887,7 @@ afs_xioctl(afs_proc_t *p, const struct ioctl_args *uap, register_t *retval) if (!ioctlDone) { # if defined(AFS_FBSD_ENV) -# if (__FreeBSD_version >= 900044) return sys_ioctl(td, uap); -# else - return ioctl(td, uap); -# endif # elif defined(AFS_OBSD_ENV) code = sys_ioctl(p, uap, retval); # elif defined(AFS_NBSD_ENV) diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index abe4a43..ac0473d 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -926,9 +926,6 @@ extern int copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst); #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #ifdef AFS_DARWIN100_ENV extern int afs3_syscall(afs_proc_t *p, void *args, unsigned int *retval); -#elif (defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)) && (__FreeBSD_version < 900044) -/* afs3_syscall prototype is in sys/sysproto.h - Yes, they put it in, then took it out again (renamed with a sys_ prefix) */ #elif defined(AFS_FBSD_ENV) extern int afs3_syscall(struct thread *p, void *args); #elif defined(AFS_NBSD50_ENV) diff --git a/src/afsweb/apache_includes/1.2/conf.h b/src/afsweb/apache_includes/1.2/conf.h index 771988f..d1fd419 100644 --- a/src/afsweb/apache_includes/1.2/conf.h +++ b/src/afsweb/apache_includes/1.2/conf.h @@ -404,8 +404,7 @@ extern char *crypt(); #define HAVE_MMAP #define DEFAULT_USER "nobody" #define DEFAULT_GROUP "nogroup" -#if defined(__bsdi__) || \ -(defined(__FreeBSD_version) && (__FreeBSD_version < 220000)) +#if defined(__bsdi__) typedef quad_t rlim_t; #endif #define USE_FLOCK_SERIALIZED_ACCEPT diff --git a/src/afsweb/apache_includes/1.3.1/ap_config.h b/src/afsweb/apache_includes/1.3.1/ap_config.h index 7bcad2c..47a6c25 100644 --- a/src/afsweb/apache_includes/1.3.1/ap_config.h +++ b/src/afsweb/apache_includes/1.3.1/ap_config.h @@ -599,8 +599,7 @@ stat() properly */ #ifndef DEFAULT_GROUP #define DEFAULT_GROUP "nogroup" #endif -#if defined(__bsdi__) || \ -(defined(__FreeBSD_version) && (__FreeBSD_version < 220000)) +#if defined(__bsdi__) typedef quad_t rlim_t; #endif #define USE_FLOCK_SERIALIZED_ACCEPT diff --git a/src/afsweb/apache_includes/1.3.6/ap_config.h b/src/afsweb/apache_includes/1.3.6/ap_config.h index e921d44..9bc4131 100644 --- a/src/afsweb/apache_includes/1.3.6/ap_config.h +++ b/src/afsweb/apache_includes/1.3.6/ap_config.h @@ -682,8 +682,7 @@ stat() properly */ #ifndef DEFAULT_GROUP #define DEFAULT_GROUP "nogroup" #endif -#if defined(__bsdi__) || \ -(defined(__FreeBSD_version) && (__FreeBSD_version < 220000)) +#if defined(__bsdi__) typedef quad_t rlim_t; #endif #define USE_FLOCK_SERIALIZED_ACCEPT diff --git a/src/afsweb/apache_includes/conf.h b/src/afsweb/apache_includes/conf.h index 1310d67..58ec27b 100644 --- a/src/afsweb/apache_includes/conf.h +++ b/src/afsweb/apache_includes/conf.h @@ -404,8 +404,7 @@ extern char *crypt(); #define HAVE_MMAP #define DEFAULT_USER "nobody" #define DEFAULT_GROUP "nogroup" -#if defined(__bsdi__) || \ -(defined(__FreeBSD_version) && (__FreeBSD_version < 220000)) +#if defined(__bsdi__) typedef quad_t rlim_t; #endif #define USE_FLOCK_SERIALIZED_ACCEPT diff --git a/src/config/param.amd64_fbsd_100.h b/src/config/param.amd64_fbsd_100.h index 4e4c5aa..adc44ea 100644 --- a/src/config/param.amd64_fbsd_100.h +++ b/src/config/param.amd64_fbsd_100.h @@ -12,40 +12,10 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 - #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 - #endif /* !defined(UKERNEL) */ #define USE_UCONTEXT diff --git a/src/config/param.amd64_fbsd_101.h b/src/config/param.amd64_fbsd_101.h index 6174faa..455b778 100644 --- a/src/config/param.amd64_fbsd_101.h +++ b/src/config/param.amd64_fbsd_101.h @@ -12,41 +12,14 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_102.h b/src/config/param.amd64_fbsd_102.h index 236b913..17a634d 100644 --- a/src/config/param.amd64_fbsd_102.h +++ b/src/config/param.amd64_fbsd_102.h @@ -12,27 +12,9 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 @@ -40,15 +22,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 diff --git a/src/config/param.amd64_fbsd_103.h b/src/config/param.amd64_fbsd_103.h index f7ed49e..17986d0 100644 --- a/src/config/param.amd64_fbsd_103.h +++ b/src/config/param.amd64_fbsd_103.h @@ -12,28 +12,10 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -42,15 +24,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.amd64_fbsd_104.h b/src/config/param.amd64_fbsd_104.h index cd3688d..d5e9e92 100644 --- a/src/config/param.amd64_fbsd_104.h +++ b/src/config/param.amd64_fbsd_104.h @@ -12,29 +12,11 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 #define AFS_FBSD104_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -44,15 +26,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.amd64_fbsd_110.h b/src/config/param.amd64_fbsd_110.h index d1bdb8d..954a7e8 100644 --- a/src/config/param.amd64_fbsd_110.h +++ b/src/config/param.amd64_fbsd_110.h @@ -12,41 +12,14 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD110_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD110_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD110_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.amd64_fbsd_111.h b/src/config/param.amd64_fbsd_111.h index a9c92b4..7bd5261 100644 --- a/src/config/param.amd64_fbsd_111.h +++ b/src/config/param.amd64_fbsd_111.h @@ -12,30 +12,12 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 #define AFS_FBSD110_ENV 1 #define AFS_FBSD111_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -46,15 +28,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.amd64_fbsd_112.h b/src/config/param.amd64_fbsd_112.h index 308c184..de7574e 100644 --- a/src/config/param.amd64_fbsd_112.h +++ b/src/config/param.amd64_fbsd_112.h @@ -12,15 +12,6 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 @@ -28,15 +19,6 @@ #define AFS_FBSD111_ENV 1 #define AFS_FBSD112_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -48,15 +30,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.amd64_fbsd_120.h b/src/config/param.amd64_fbsd_120.h index 9d995de..4b17ab2 100644 --- a/src/config/param.amd64_fbsd_120.h +++ b/src/config/param.amd64_fbsd_120.h @@ -12,15 +12,6 @@ #define AFS_64BITUSERPOINTER_ENV 1 -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 @@ -29,15 +20,6 @@ #define AFS_FBSD111_ENV 1 #define AFS_FBSD120_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -50,15 +32,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.amd64_fbsd_80.h b/src/config/param.amd64_fbsd_80.h deleted file mode 100644 index ba701d3..0000000 --- a/src/config/param.amd64_fbsd_80.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_80" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_80 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_81.h b/src/config/param.amd64_fbsd_81.h deleted file mode 100644 index bd3ca57..0000000 --- a/src/config/param.amd64_fbsd_81.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_81" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_81 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_82.h b/src/config/param.amd64_fbsd_82.h deleted file mode 100644 index 58a9cdb..0000000 --- a/src/config/param.amd64_fbsd_82.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_82" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_82 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_83.h b/src/config/param.amd64_fbsd_83.h deleted file mode 100644 index 5d336a5..0000000 --- a/src/config/param.amd64_fbsd_83.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_83" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_83 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_84.h b/src/config/param.amd64_fbsd_84.h deleted file mode 100644 index f5fae34..0000000 --- a/src/config/param.amd64_fbsd_84.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_84" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_84 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_90.h b/src/config/param.amd64_fbsd_90.h deleted file mode 100644 index 95130de..0000000 --- a/src/config/param.amd64_fbsd_90.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_90" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_90 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_91.h b/src/config/param.amd64_fbsd_91.h deleted file mode 100644 index 75fda5b..0000000 --- a/src/config/param.amd64_fbsd_91.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_91" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_91 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_92.h b/src/config/param.amd64_fbsd_92.h deleted file mode 100644 index efed685..0000000 --- a/src/config/param.amd64_fbsd_92.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_92" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_92 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.amd64_fbsd_93.h b/src/config/param.amd64_fbsd_93.h deleted file mode 100644 index 20e0cab..0000000 --- a/src/config/param.amd64_fbsd_93.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "amd64_fbsd_93" -#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_93 - -#define AFS_64BITPOINTER_ENV 1 - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_64BITUSERPOINTER_ENV 1 - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_100.h b/src/config/param.i386_fbsd_100.h index ee6e616..e8cb97d 100644 --- a/src/config/param.i386_fbsd_100.h +++ b/src/config/param.i386_fbsd_100.h @@ -10,40 +10,10 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 - #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 - #endif /* !defined(UKERNEL) */ #endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_101.h b/src/config/param.i386_fbsd_101.h index 950e4b2..9981ee0 100644 --- a/src/config/param.i386_fbsd_101.h +++ b/src/config/param.i386_fbsd_101.h @@ -10,41 +10,14 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #else /* !defined(UKERNEL) */ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #endif /* !defined(UKERNEL) */ diff --git a/src/config/param.i386_fbsd_102.h b/src/config/param.i386_fbsd_102.h index 30de8e4..37a186b 100644 --- a/src/config/param.i386_fbsd_102.h +++ b/src/config/param.i386_fbsd_102.h @@ -10,27 +10,9 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 @@ -38,15 +20,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 diff --git a/src/config/param.i386_fbsd_103.h b/src/config/param.i386_fbsd_103.h index 598ed41..c2b2208 100644 --- a/src/config/param.i386_fbsd_103.h +++ b/src/config/param.i386_fbsd_103.h @@ -10,28 +10,10 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -40,15 +22,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.i386_fbsd_104.h b/src/config/param.i386_fbsd_104.h index 3ec50f1..47ee4bf 100644 --- a/src/config/param.i386_fbsd_104.h +++ b/src/config/param.i386_fbsd_104.h @@ -10,29 +10,11 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 #define AFS_FBSD104_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -42,15 +24,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.i386_fbsd_110.h b/src/config/param.i386_fbsd_110.h index 7d7129c..d554d74 100644 --- a/src/config/param.i386_fbsd_110.h +++ b/src/config/param.i386_fbsd_110.h @@ -10,27 +10,9 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD110_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD110_ENV 1 @@ -38,15 +20,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD110_ENV 1 diff --git a/src/config/param.i386_fbsd_111.h b/src/config/param.i386_fbsd_111.h index cd33dfd..1d8d2a0 100644 --- a/src/config/param.i386_fbsd_111.h +++ b/src/config/param.i386_fbsd_111.h @@ -10,30 +10,12 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 #define AFS_FBSD110_ENV 1 #define AFS_FBSD111_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -44,15 +26,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.i386_fbsd_112.h b/src/config/param.i386_fbsd_112.h index f2c0131..1724c6d 100644 --- a/src/config/param.i386_fbsd_112.h +++ b/src/config/param.i386_fbsd_112.h @@ -10,15 +10,6 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 @@ -26,15 +17,6 @@ #define AFS_FBSD111_ENV 1 #define AFS_FBSD112_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -46,15 +28,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.i386_fbsd_120.h b/src/config/param.i386_fbsd_120.h index 399d9d9..ff1e140 100644 --- a/src/config/param.i386_fbsd_120.h +++ b/src/config/param.i386_fbsd_120.h @@ -10,15 +10,6 @@ #ifndef UKERNEL /* This section for kernel libafs compiles only */ -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 -#define AFS_FBSD100_ENV 1 #define AFS_FBSD101_ENV 1 #define AFS_FBSD102_ENV 1 #define AFS_FBSD103_ENV 1 @@ -27,15 +18,6 @@ #define AFS_FBSD111_ENV 1 #define AFS_FBSD120_ENV 1 -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 -#define AFS_X86_FBSD100_ENV 1 #define AFS_X86_FBSD101_ENV 1 #define AFS_X86_FBSD102_ENV 1 #define AFS_X86_FBSD103_ENV 1 @@ -48,15 +30,6 @@ /* This section for user space compiles only */ -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 -#define AFS_USR_FBSD100_ENV 1 #define AFS_USR_FBSD101_ENV 1 #define AFS_USR_FBSD102_ENV 1 #define AFS_USR_FBSD103_ENV 1 diff --git a/src/config/param.i386_fbsd_80.h b/src/config/param.i386_fbsd_80.h deleted file mode 100644 index 769cb9b..0000000 --- a/src/config/param.i386_fbsd_80.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_80" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_80 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_81.h b/src/config/param.i386_fbsd_81.h deleted file mode 100644 index bcf4b1d..0000000 --- a/src/config/param.i386_fbsd_81.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_81" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_81 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_82.h b/src/config/param.i386_fbsd_82.h deleted file mode 100644 index d91a166..0000000 --- a/src/config/param.i386_fbsd_82.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_82" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_82 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_83.h b/src/config/param.i386_fbsd_83.h deleted file mode 100644 index dc538b8..0000000 --- a/src/config/param.i386_fbsd_83.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_83" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_83 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_84.h b/src/config/param.i386_fbsd_84.h deleted file mode 100644 index 541ab61..0000000 --- a/src/config/param.i386_fbsd_84.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_84" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_84 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_90.h b/src/config/param.i386_fbsd_90.h deleted file mode 100644 index 3463910..0000000 --- a/src/config/param.i386_fbsd_90.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_90" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_90 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_91.h b/src/config/param.i386_fbsd_91.h deleted file mode 100644 index 35c9b72..0000000 --- a/src/config/param.i386_fbsd_91.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_91" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_91 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_92.h b/src/config/param.i386_fbsd_92.h deleted file mode 100644 index 8d2f531..0000000 --- a/src/config/param.i386_fbsd_92.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_92" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_92 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/config/param.i386_fbsd_93.h b/src/config/param.i386_fbsd_93.h deleted file mode 100644 index e62b96e..0000000 --- a/src/config/param.i386_fbsd_93.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef AFS_PARAM_H -#define AFS_PARAM_H - -/* Machine / Operating system information */ -#define SYS_NAME "i386_fbsd_93" -#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_93 - -#define AFS_FAKEOPEN_ENV 1 /* call afs_FakeOpen as if !AFS_VM_RDWR */ - -#ifndef UKERNEL -/* This section for kernel libafs compiles only */ - -#define AFS_FBSD81_ENV 1 -#define AFS_FBSD82_ENV 1 -#define AFS_FBSD83_ENV 1 -#define AFS_FBSD84_ENV 1 -#define AFS_FBSD90_ENV 1 -#define AFS_FBSD91_ENV 1 -#define AFS_FBSD92_ENV 1 -#define AFS_FBSD93_ENV 1 - -#define AFS_X86_FBSD81_ENV 1 -#define AFS_X86_FBSD82_ENV 1 -#define AFS_X86_FBSD83_ENV 1 -#define AFS_X86_FBSD84_ENV 1 -#define AFS_X86_FBSD90_ENV 1 -#define AFS_X86_FBSD91_ENV 1 -#define AFS_X86_FBSD92_ENV 1 -#define AFS_X86_FBSD93_ENV 1 - -#else /* !defined(UKERNEL) */ - -/* This section for user space compiles only */ - -#define AFS_USR_FBSD81_ENV 1 -#define AFS_USR_FBSD82_ENV 1 -#define AFS_USR_FBSD83_ENV 1 -#define AFS_USR_FBSD84_ENV 1 -#define AFS_USR_FBSD90_ENV 1 -#define AFS_USR_FBSD91_ENV 1 -#define AFS_USR_FBSD92_ENV 1 -#define AFS_USR_FBSD93_ENV 1 - -#endif /* !defined(UKERNEL) */ - -#endif /* AFS_PARAM_H */ diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c index 87561d3..5d4b304 100644 --- a/src/rx/FBSD/rx_knet.c +++ b/src/rx/FBSD/rx_knet.c @@ -96,11 +96,7 @@ osi_StopListener(void) p = pfind(rxk_ListenerPid); if (p) { afs_warn("osi_StopListener: rxk_ListenerPid %u\n", rxk_ListenerPid); -#if (__FreeBSD_version >= 900044) kern_psignal(p, SIGUSR1); -#else - psignal(p, SIGUSR1); -#endif PROC_UNLOCK(p); } else afs_warn("osi_StopListener: rxk_Listener not found (pid %u)\n", diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h index c6318f3..93d7f5c 100644 --- a/src/rx/rx_kernel.h +++ b/src/rx/rx_kernel.h @@ -80,7 +80,7 @@ extern void osi_Panic(char *fmt, ...) #define rx_ifnet_flags(x) (x?(x)->if_flags:0) #if defined(FBSD_IFA_IFWITHNET_THREE_ARGS) #define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0, RT_ALL_FIBS) -#elif defined(AFS_OBSD46_ENV) || defined(AFS_FBSD81_ENV) +#elif defined(AFS_OBSD46_ENV) || defined(AFS_FBSD_ENV) #define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0) #else #define rx_ifaddr_withnet(x) ifa_ifwithnet(x) -- 1.9.4