From 3d7bad5c22c4556f7f6bcc11e3311dcdb57f7288 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 17 Jun 2001 02:02:10 +0000 Subject: [PATCH] patch 02_modversions: Include modversion before anything else so we get the right symbols for things like memcpy --- debian/patch.02_modversions | 268 +++++++++++++++++++++++++++++++ src/config/param.i386_linux22.h | 30 ++-- src/config/param.i386_linux24.h | 30 ++-- src/config/param.ppc_linux22.h | 34 ++-- src/config/param.ppc_linux24.h | 32 ++-- src/config/param.sparc_linux22.h | 34 ++-- 6 files changed, 354 insertions(+), 74 deletions(-) create mode 100644 debian/patch.02_modversions diff --git a/debian/patch.02_modversions b/debian/patch.02_modversions new file mode 100644 index 000000000..8cb822722 --- /dev/null +++ b/debian/patch.02_modversions @@ -0,0 +1,268 @@ +Index: src/config/param.i386_linux22.h +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.i386_linux22.h,v +retrieving revision 1.1.1.4 +diff -u -r1.1.1.4 param.i386_linux22.h +--- src/config/param.i386_linux22.h 2001/04/23 18:42:11 1.1.1.4 ++++ src/config/param.i386_linux22.h 2001/06/17 01:56:35 +@@ -27,21 +27,6 @@ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ +-#include +- +-#define AFS_USERSPACE_IP_ADDR 1 +-#define RXK_LISTENER_ENV 1 +-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +- +- +-/* Machine / Operating system information */ +-#define SYS_NAME "i386_linux22" +-#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 +-#define AFSLITTLE_ENDIAN 1 +-#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +-#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +-#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ +- + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + #ifdef CONFIG_SMP +@@ -65,6 +50,21 @@ + #endif + + #endif /* __KERNEL__ && !DUMP_KERNEL*/ ++#include ++ ++#define AFS_USERSPACE_IP_ADDR 1 ++#define RXK_LISTENER_ENV 1 ++#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ ++ ++ ++/* Machine / Operating system information */ ++#define SYS_NAME "i386_linux22" ++#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 ++#define AFSLITTLE_ENDIAN 1 ++#define AFS_HAVE_FFS 1 /* Use system's ffs. */ ++#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ ++#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ ++ + + #ifdef KERNEL + #ifndef MIN +Index: src/config/param.i386_linux24.h +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.i386_linux24.h,v +retrieving revision 1.1.1.2 +diff -u -r1.1.1.2 param.i386_linux24.h +--- src/config/param.i386_linux24.h 2001/03/07 09:43:18 1.1.1.2 ++++ src/config/param.i386_linux24.h 2001/06/17 01:51:59 +@@ -20,21 +20,6 @@ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ +-#include +- +-#define AFS_USERSPACE_IP_ADDR 1 +-#define RXK_LISTENER_ENV 1 +-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +- +- +-/* Machine / Operating system information */ +-#define SYS_NAME "i386_linux24" +-#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 +-#define AFSLITTLE_ENDIAN 1 +-#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +-#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +-#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ +- + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + #ifdef CONFIG_SMP +@@ -58,6 +43,21 @@ + #endif + + #endif /* __KERNEL__ && !DUMP_KERNEL*/ ++#include ++ ++#define AFS_USERSPACE_IP_ADDR 1 ++#define RXK_LISTENER_ENV 1 ++#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ ++ ++ ++/* Machine / Operating system information */ ++#define SYS_NAME "i386_linux24" ++#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 ++#define AFSLITTLE_ENDIAN 1 ++#define AFS_HAVE_FFS 1 /* Use system's ffs. */ ++#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ ++#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ ++ + + #ifdef KERNEL + #ifndef MIN +Index: src/config/param.ppc_linux22.h +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.ppc_linux22.h,v +retrieving revision 1.1 +diff -u -r1.1 param.ppc_linux22.h +--- src/config/param.ppc_linux22.h 2001/02/18 03:34:40 1.1 ++++ src/config/param.ppc_linux22.h 2001/06/17 01:50:45 +@@ -18,21 +18,6 @@ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ +-#include +- +-#define AFS_USERSPACE_IP_ADDR 1 +-#define RXK_LISTENER_ENV 1 +-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +- +- +-/* Machine / Operating system information */ +-#define SYS_NAME "ppc_linux22" +-#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 +-#define AFSBIG_ENDIAN 1 +-#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +-#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +-#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ +- + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + #ifdef CONFIG_SMP +@@ -47,7 +32,26 @@ + #define AFS_GLOBAL_SUNLOCK + #endif + ++#if defined(MODULE) && defined(CONFIG_MODVERSIONS) ++#define MODVERSIONS ++#include ++#endif + #endif /* __KERNEL__ && !DUMP_KERNEL*/ ++#include ++ ++#define AFS_USERSPACE_IP_ADDR 1 ++#define RXK_LISTENER_ENV 1 ++#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ ++ ++ ++/* Machine / Operating system information */ ++#define SYS_NAME "ppc_linux22" ++#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 ++#define AFSBIG_ENDIAN 1 ++#define AFS_HAVE_FFS 1 /* Use system's ffs. */ ++#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ ++#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ ++ + + #ifdef KERNEL + #ifndef MIN +Index: src/config/param.ppc_linux24.h +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.ppc_linux24.h,v +retrieving revision 1.1.1.1 +diff -u -r1.1.1.1 param.ppc_linux24.h +--- src/config/param.ppc_linux24.h 2000/12/03 06:22:59 1.1.1.1 ++++ src/config/param.ppc_linux24.h 2001/06/17 01:50:45 +@@ -20,6 +20,24 @@ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ ++#include ++#ifdef CONFIG_SMP ++#undef CONFIG_SMP ++#endif ++/* Using "AFS_SMP" to map to however many #define's are required to get ++ * MP to compile for Linux ++ */ ++#ifdef AFS_SMP ++#define CONFIG_SMP ++#define __SMP__ ++#define AFS_GLOBAL_SUNLOCK ++#endif ++ ++#if defined(MODULE) && defined(CONFIG_MODVERSIONS) ++#define MODVERSIONS ++#include ++#endif ++#endif /* __KERNEL__ && !DUMP_KERNEL*/ + #include + + #define AFS_USERSPACE_IP_ADDR 1 +@@ -36,20 +54,6 @@ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) +-#include +-#ifdef CONFIG_SMP +-#undef CONFIG_SMP +-#endif +-/* Using "AFS_SMP" to map to however many #define's are required to get +- * MP to compile for Linux +- */ +-#ifdef AFS_SMP +-#define CONFIG_SMP +-#define __SMP__ +-#define AFS_GLOBAL_SUNLOCK +-#endif +- +-#endif /* __KERNEL__ && !DUMP_KERNEL*/ + + #ifdef KERNEL + #ifndef MIN +Index: src/config/param.sparc_linux22.h +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/param.sparc_linux22.h,v +retrieving revision 1.1 +diff -u -r1.1 param.sparc_linux22.h +--- src/config/param.sparc_linux22.h 2001/01/16 05:39:04 1.1 ++++ src/config/param.sparc_linux22.h 2001/06/17 01:50:45 +@@ -21,21 +21,6 @@ + #define AFS_SYSCALL 227 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ +-#include +- +-#define AFS_USERSPACE_IP_ADDR 1 +-#define RXK_LISTENER_ENV 1 +-#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ +- +- +-/* Machine / Operating system information */ +-#define SYS_NAME "sparc_linux22" +-#define SYS_NAME_ID SYS_NAME_ID_sparc_linux22 +-#define AFSBIG_ENDIAN 1 +-#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +-#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +-#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ +- + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + #ifdef CONFIG_SMP +@@ -49,8 +34,27 @@ + #define __SMP__ + #define AFS_GLOBAL_SUNLOCK + #endif ++#if defined(MODULE) && defined(CONFIG_MODVERSIONS) ++#define MODVERSIONS ++#include ++#endif + + #endif /* __KERNEL__ && !DUMP_KERNEL*/ ++#include ++ ++#define AFS_USERSPACE_IP_ADDR 1 ++#define RXK_LISTENER_ENV 1 ++#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ ++ ++ ++/* Machine / Operating system information */ ++#define SYS_NAME "sparc_linux22" ++#define SYS_NAME_ID SYS_NAME_ID_sparc_linux22 ++#define AFSBIG_ENDIAN 1 ++#define AFS_HAVE_FFS 1 /* Use system's ffs. */ ++#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ ++#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ ++ + + #ifdef KERNEL + #ifndef MIN diff --git a/src/config/param.i386_linux22.h b/src/config/param.i386_linux22.h index 85506a61c..fa2f99ed6 100644 --- a/src/config/param.i386_linux22.h +++ b/src/config/param.i386_linux22.h @@ -27,21 +27,6 @@ #define AFS_SYSCALL 137 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#include - -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - - -/* Machine / Operating system information */ -#define SYS_NAME "i386_linux22" -#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) #include #ifdef CONFIG_SMP @@ -65,6 +50,21 @@ #endif #endif /* __KERNEL__ && !DUMP_KERNEL*/ +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + +/* Machine / Operating system information */ +#define SYS_NAME "i386_linux22" +#define SYS_NAME_ID SYS_NAME_ID_i386_linux22 +#define AFSLITTLE_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + #ifdef KERNEL #ifndef MIN diff --git a/src/config/param.i386_linux24.h b/src/config/param.i386_linux24.h index 0e8e95401..ea36e8121 100644 --- a/src/config/param.i386_linux24.h +++ b/src/config/param.i386_linux24.h @@ -20,21 +20,6 @@ #define AFS_SYSCALL 137 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#include - -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - - -/* Machine / Operating system information */ -#define SYS_NAME "i386_linux24" -#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 -#define AFSLITTLE_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) #include #ifdef CONFIG_SMP @@ -58,6 +43,21 @@ #endif #endif /* __KERNEL__ && !DUMP_KERNEL*/ +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + +/* Machine / Operating system information */ +#define SYS_NAME "i386_linux24" +#define SYS_NAME_ID SYS_NAME_ID_i386_linux24 +#define AFSLITTLE_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + #ifdef KERNEL #ifndef MIN diff --git a/src/config/param.ppc_linux22.h b/src/config/param.ppc_linux22.h index 93e46cf34..c28276962 100644 --- a/src/config/param.ppc_linux22.h +++ b/src/config/param.ppc_linux22.h @@ -18,21 +18,6 @@ #define AFS_SYSCALL 137 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#include - -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - - -/* Machine / Operating system information */ -#define SYS_NAME "ppc_linux22" -#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) #include #ifdef CONFIG_SMP @@ -47,7 +32,26 @@ #define AFS_GLOBAL_SUNLOCK #endif +#if defined(MODULE) && defined(CONFIG_MODVERSIONS) +#define MODVERSIONS +#include +#endif #endif /* __KERNEL__ && !DUMP_KERNEL*/ +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + +/* Machine / Operating system information */ +#define SYS_NAME "ppc_linux22" +#define SYS_NAME_ID SYS_NAME_ID_ppc_linux22 +#define AFSBIG_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + #ifdef KERNEL #ifndef MIN diff --git a/src/config/param.ppc_linux24.h b/src/config/param.ppc_linux24.h index b88c0c01e..183388f01 100644 --- a/src/config/param.ppc_linux24.h +++ b/src/config/param.ppc_linux24.h @@ -20,6 +20,24 @@ #define AFS_SYSCALL 137 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ +#include +#ifdef CONFIG_SMP +#undef CONFIG_SMP +#endif +/* Using "AFS_SMP" to map to however many #define's are required to get + * MP to compile for Linux + */ +#ifdef AFS_SMP +#define CONFIG_SMP +#define __SMP__ +#define AFS_GLOBAL_SUNLOCK +#endif + +#if defined(MODULE) && defined(CONFIG_MODVERSIONS) +#define MODVERSIONS +#include +#endif +#endif /* __KERNEL__ && !DUMP_KERNEL*/ #include #define AFS_USERSPACE_IP_ADDR 1 @@ -36,20 +54,6 @@ #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) -#include -#ifdef CONFIG_SMP -#undef CONFIG_SMP -#endif -/* Using "AFS_SMP" to map to however many #define's are required to get - * MP to compile for Linux - */ -#ifdef AFS_SMP -#define CONFIG_SMP -#define __SMP__ -#define AFS_GLOBAL_SUNLOCK -#endif - -#endif /* __KERNEL__ && !DUMP_KERNEL*/ #ifdef KERNEL #ifndef MIN diff --git a/src/config/param.sparc_linux22.h b/src/config/param.sparc_linux22.h index f0b4214d6..dc72d2624 100644 --- a/src/config/param.sparc_linux22.h +++ b/src/config/param.sparc_linux22.h @@ -21,21 +21,6 @@ #define AFS_SYSCALL 227 #define AFS_64BIT_IOPS_ENV 1 #define AFS_NAMEI_ENV 1 /* User space interface to file system */ -#include - -#define AFS_USERSPACE_IP_ADDR 1 -#define RXK_LISTENER_ENV 1 -#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ - - -/* Machine / Operating system information */ -#define SYS_NAME "sparc_linux22" -#define SYS_NAME_ID SYS_NAME_ID_sparc_linux22 -#define AFSBIG_ENDIAN 1 -#define AFS_HAVE_FFS 1 /* Use system's ffs. */ -#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ -#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ - #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) #include #ifdef CONFIG_SMP @@ -49,8 +34,27 @@ #define __SMP__ #define AFS_GLOBAL_SUNLOCK #endif +#if defined(MODULE) && defined(CONFIG_MODVERSIONS) +#define MODVERSIONS +#include +#endif #endif /* __KERNEL__ && !DUMP_KERNEL*/ +#include + +#define AFS_USERSPACE_IP_ADDR 1 +#define RXK_LISTENER_ENV 1 +#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + +/* Machine / Operating system information */ +#define SYS_NAME "sparc_linux22" +#define SYS_NAME_ID SYS_NAME_ID_sparc_linux22 +#define AFSBIG_ENDIAN 1 +#define AFS_HAVE_FFS 1 /* Use system's ffs. */ +#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ +#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + #ifdef KERNEL #ifndef MIN -- 2.39.5