From: Sam Hartman Date: Sat, 26 Jul 2003 22:13:23 +0000 (+0000) Subject: Patch for 2.4.21 X-Git-Tag: debian/1.2.9-3~2 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ca7408e323e9fa65ef359e87e0842aa8b16ff499;p=packages%2Fo%2Fopenafs.git Patch for 2.4.21 --- diff --git a/debian/patch.07_kernel_source_2.4.21 b/debian/patch.07_kernel_source_2.4.21 new file mode 100644 index 000000000..24a17741c --- /dev/null +++ b/debian/patch.07_kernel_source_2.4.21 @@ -0,0 +1,44 @@ +Index: src/libafs/MakefileProto.LINUX.in +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/libafs/MakefileProto.LINUX.in,v +retrieving revision 1.9 +diff -u -r1.9 MakefileProto.LINUX.in +--- src/libafs/MakefileProto.LINUX.in 11 Dec 2002 03:00:40 -0000 1.9 ++++ src/libafs/MakefileProto.LINUX.in 26 Jul 2003 20:46:52 -0000 +@@ -89,7 +89,7 @@ + -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step + DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL ${SMP_DEF} -DMODULE + +-INCLUDES = -I. -I../ -I${TOP_SRCDIR}/config ++INCLUDES = -I. -I../ -I${LINUX_KERNEL_PATH}/include -I${TOP_SRCDIR}/config + + CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES) + +Index: src/rx/rx_kcommon.h +=================================================================== +RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/rx/rx_kcommon.h,v +retrieving revision 1.1.1.9 +diff -u -r1.1.1.9 rx_kcommon.h +--- src/rx/rx_kcommon.h 13 Apr 2003 19:07:24 -0000 1.1.1.9 ++++ src/rx/rx_kcommon.h 26 Jul 2003 20:46:53 -0000 +@@ -33,7 +33,10 @@ + #include "../h/disp.h" + #endif + #include "../h/socket.h" +-#ifndef AFS_LINUX22_ENV ++#ifdef AFS_LINUX22_ENV ++#define _LINUX_CODA_FS_I ++struct coda_inode_info {}; ++#else + #include "../h/socketvar.h" + #include "../h/protosw.h" + #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) +@@ -80,8 +83,6 @@ + #include "../h/user.h" + #endif + #ifdef AFS_LINUX22_ENV +-#define _LINUX_CODA_FS_I +-struct coda_inode_info {}; + #include "../h/sched.h" + #include "../h/netdevice.h" + #else