mirror of
https://git.openafs.org/openafs.git
synced 2025-01-31 05:27:44 +00:00
OpenBSD: Make OpenBSD 4.7 param headers consistent
OpenBSD follows the policy of using a separate common param file (post 1.4.x). However, when introducing support for i386 OpenBSD 4.7, this was not done and a single param config header file was created instead. This patch changes the param files for OpenBSD 4.7 so that they are consistent with the other OpenBSD versions by using a separate common param header file. Reviewed-on: http://gerrit.openafs.org/3725 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org> Tested-by: Derrick Brashear <shadow@dementia.org> (cherry picked from commit cd6bd75d1c97ce87ab1597d80fcd3cee2ea18825) Change-Id: I5845e68f3fd7fac905993a0ac7a371e058c9a618 Reviewed-on: http://gerrit.openafs.org/3920 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Antoine Verheijen
Derrick Brashear
parent
e648f30a67
commit
471ec3d1e2
@ -712,6 +712,7 @@ case $AFS_SYSNAME in
|
||||
*_obsd44) AFS_PARAM_COMMON=param.obsd44.h ;;
|
||||
*_obsd45) AFS_PARAM_COMMON=param.obsd45.h ;;
|
||||
*_obsd46) AFS_PARAM_COMMON=param.obsd46.h ;;
|
||||
*_obsd47) AFS_PARAM_COMMON=param.obsd47.h ;;
|
||||
*_linux22) AFS_PARAM_COMMON=param.linux22.h ;;
|
||||
*_linux24) AFS_PARAM_COMMON=param.linux24.h ;;
|
||||
*_linux26) AFS_PARAM_COMMON=param.linux26.h ;;
|
||||
|
||||
@ -317,6 +317,7 @@
|
||||
#define SYS_NAME_ID_amd64_obsd44 4013
|
||||
#define SYS_NAME_ID_amd64_obsd45 4014
|
||||
#define SYS_NAME_ID_amd64_obsd46 4015
|
||||
#define SYS_NAME_ID_amd64_obsd47 4016
|
||||
|
||||
/*
|
||||
* Placeholder to keep system-wide standard flags since this file is included by all
|
||||
|
||||
19
src/config/param.amd64_obsd47.h
Normal file
19
src/config/param.amd64_obsd47.h
Normal file
@ -0,0 +1,19 @@
|
||||
/*
|
||||
* Thanks to Jim Rees and University of Michigan CITI, for the initial
|
||||
* OpenBSD porting work.
|
||||
*/
|
||||
|
||||
#ifndef AFS_AMD64_PARAM_H
|
||||
#define AFS_AMD64_PARAM_H
|
||||
|
||||
#define SYS_NAME "amd64_obsd47"
|
||||
#define SYS_NAME_ID SYS_NAME_ID_amd64_obsd47
|
||||
|
||||
#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
|
||||
#define AFS_X86_XBSD_ENV 1
|
||||
#define AFS_X86_ENV 1
|
||||
#define AFS_64BITPOINTER_ENV 1
|
||||
#define AFS_64BITUSERPOINTER_ENV 1
|
||||
#define AFSLITTLE_ENDIAN 1
|
||||
|
||||
#endif /* AFS_AMD64_PARAM_H */
|
||||
@ -1,77 +1,16 @@
|
||||
/*
|
||||
* Jim Rees, University of Michigan CITI
|
||||
* Thanks to Jim Rees and University of Michigan CITI, for the initial
|
||||
* OpenBSD porting work.
|
||||
*/
|
||||
|
||||
#ifndef AFS_PARAM_H
|
||||
#define AFS_PARAM_H
|
||||
|
||||
#ifndef IGNORE_STDS_H
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
#ifndef AFS_I386_PARAM_H
|
||||
#define AFS_I386_PARAM_H
|
||||
|
||||
#define SYS_NAME "i386_obsd47"
|
||||
#define SYS_NAME_ID SYS_NAME_ID_i386_obsd47
|
||||
|
||||
#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
|
||||
#define AFS_X86_XBSD_ENV 1
|
||||
|
||||
#define AFS_NAMEI_ENV 1 /* User space interface to file system */
|
||||
#define AFS_64BIT_ENV 1
|
||||
#define AFS_64BIT_CLIENT 1
|
||||
#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
|
||||
#define AFS_OBSD_ENV 1
|
||||
#define AFS_OBSD34_ENV 1
|
||||
#define AFS_OBSD35_ENV 1
|
||||
#define AFS_OBSD36_ENV 1
|
||||
#define AFS_OBSD37_ENV 1
|
||||
#define AFS_OBSD38_ENV 1
|
||||
#define AFS_OBSD39_ENV 1
|
||||
#define AFS_OBSD40_ENV 1
|
||||
#define AFS_OBSD41_ENV 1
|
||||
#define AFS_OBSD42_ENV 1
|
||||
#define AFS_OBSD43_ENV 1
|
||||
#define AFS_OBSD44_ENV 1
|
||||
#define AFS_OBSD45_ENV 1
|
||||
#define AFS_OBSD46_ENV 1
|
||||
#define AFS_OBSD47_ENV 1
|
||||
#define AFS_NONFSTRANS 1
|
||||
#define AFS_VM_RDWR_ENV 1
|
||||
#define AFS_VFS_ENV 1
|
||||
#define AFS_VFSINCL_ENV 1
|
||||
|
||||
#define FTRUNC O_TRUNC
|
||||
|
||||
#define AFS_SYSCALL 208
|
||||
#define AFS_MOUNT_AFS "afs"
|
||||
|
||||
#define RXK_LISTENER_ENV 1
|
||||
#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
|
||||
#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
|
||||
|
||||
#define AFS_X86_ENV 1
|
||||
#define AFSLITTLE_ENDIAN 1
|
||||
|
||||
#ifndef IGNORE_STDS_H
|
||||
#include <afs/afs_sysnames.h>
|
||||
#endif
|
||||
|
||||
/* Extra kernel definitions (from kdefs file) */
|
||||
#ifdef _KERNEL
|
||||
#ifdef MULTIPROCESSOR
|
||||
#define AFS_GLOBAL_SUNLOCK 1
|
||||
#endif
|
||||
#define AFS_SHORTGID 0 /* are group id's short? */
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* AFS_PARAM_H */
|
||||
#endif /* AFS_I386_PARAM_H */
|
||||
|
||||
77
src/config/param.obsd47.h
Normal file
77
src/config/param.obsd47.h
Normal file
@ -0,0 +1,77 @@
|
||||
/*
|
||||
* Thanks to Jim Rees and University of Michigan CITI, for the initial
|
||||
* OpenBSD porting work.
|
||||
*/
|
||||
|
||||
#ifndef AFS_PARAM_H
|
||||
#define AFS_PARAM_H
|
||||
|
||||
#ifndef IGNORE_STDS_H
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
|
||||
|
||||
#define AFS_NAMEI_ENV 1 /* User space interface to file system */
|
||||
#define AFS_64BIT_ENV 1
|
||||
#define AFS_64BIT_CLIENT 1
|
||||
#define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */
|
||||
|
||||
#define AFS_OBSD_ENV 1
|
||||
#define AFS_OBSD31_ENV 1
|
||||
#define AFS_OBSD32_ENV 1
|
||||
#define AFS_OBSD33_ENV 1
|
||||
#define AFS_OBSD34_ENV 1
|
||||
#define AFS_OBSD35_ENV 1
|
||||
#define AFS_OBSD36_ENV 1
|
||||
#define AFS_OBSD37_ENV 1
|
||||
#define AFS_OBSD38_ENV 1
|
||||
#define AFS_OBSD39_ENV 1
|
||||
#define AFS_OBSD40_ENV 1
|
||||
#define AFS_OBSD41_ENV 1
|
||||
#define AFS_OBSD42_ENV 1
|
||||
#define AFS_OBSD43_ENV 1
|
||||
#define AFS_OBSD44_ENV 1
|
||||
#define AFS_OBSD45_ENV 1
|
||||
#define AFS_OBSD46_ENV 1
|
||||
#define AFS_OBSD47_ENV 1
|
||||
#undef AFS_NONFSTRANS
|
||||
#define AFS_NONFSTRANS 1
|
||||
#define AFS_VM_RDWR_ENV 1
|
||||
#define AFS_VFS_ENV 1
|
||||
#define AFS_VFSINCL_ENV 1
|
||||
|
||||
#define FTRUNC O_TRUNC
|
||||
|
||||
#define AFS_SYSCALL 208
|
||||
#define AFS_MOUNT_AFS "afs"
|
||||
|
||||
#define RXK_LISTENER_ENV 1
|
||||
#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
|
||||
#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */
|
||||
|
||||
#ifndef IGNORE_STDS_H
|
||||
#include <afs/afs_sysnames.h>
|
||||
#endif
|
||||
|
||||
/* Extra kernel definitions (from kdefs file) */
|
||||
#ifdef _KERNEL
|
||||
#ifdef MULTIPROCESSOR
|
||||
#define AFS_GLOBAL_SUNLOCK 1
|
||||
#endif
|
||||
#define AFS_SHORTGID 0 /* are group id's short? */
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* AFS_PARAM_H */
|
||||
Loading…
x
Reference in New Issue
Block a user