[OpenAFS] Applying Patch to OpenAFS 1.2.7

Computers in Medicine pittmed@pittmed.pitt.edu
Thu, 31 Oct 2002 01:33:48 -0500


I'm trying to apply the patch to OpenAFS 1.2.7 so I can use it with kernel
2.4.17-17-7.x.  I got the patch by exporting the list archive to a text file
called patchfile using Pine, cutting out the patch, and typing

> munpack patchfile

I don't remember the name of the file that gave me, but I renamed it to
openafs-1.2.7-patch.  That file is here:

http://www.pittmed.pitt.edu/files/openafs-1.2.7-patch.gz

I had the OpenAFS 1.2.7 source file in /usr/src

> pwd
/usr/src

> tar -xf openafs-1.2.7-src.tar
> mv openafs-1.2.7 openafs-1.2.7-orig
> tar -xf openafs-1.2.7-src.tar
> diff -ru openafs-1.2.7 openafs-1.2.7-orig

(no differences)

> cd openafs-1.2.7

> patch -p1 < ../openafs-1.2.7-patch
patching file acconfig.h
patching file acinclude.m4
patching file src/afs/LINUX/osi_module.c
patching file src/cf/linux-test4.m4
patching file src/libafs/MakefileProto.LINUX.in

> cd ..
> diff -ru openafs-1.2.7-orig openafs-1.2.7 > newdiff

(newdiff is the diff between the original source directory and the patched
source directory, expected to be same as openafs-1.2.7-patch, it almost is
but not exactly, see below )

> cd openafs-1.2.7
> ./configure --with-linux-kernel-headers=/usr/src/linux-2.4.18-17-7-x
> make

However, the build fails with the following output

Building in directory: MODLOAD-2.4.18-17.7.x-MP
make[4]: Entering directory
`/usr/src/openafs-1.2.7/src/libafs/MODLOAD-2.4.18-17
.7.x-MP'
gcc   -O2 -fomit-frame-pointer @LINUX_GCC_KOPTS@ -pipe
@P5PLUS_KOPTS@ -D__KERNEL
__  -DCPU=586 -DKERNEL -D_KERNEL -DMODULE -DAFS_SMP -D__BOOT_KERNEL_UP=0 -D_
_BOO
T_KERNEL_SMP=1   -I. -I../ -I/usr/src/openafs-1.2.7/src/config -c
../afs/afs_atomlist.c;
gcc: @LINUX_GCC_KOPTS@: No such file or directory
gcc: @P5PLUS_KOPTS@: No such file or directory
make[4]: *** [afs_atomlist.o] Error 1
make[4]: Leaving directory `/usr/src/openafs-1.2.7/src/libafs/MODLOAD
2.4.18-17.7.x-MP'
make[3]: *** [linux_compdirs] Error 2
make[3]: Leaving directory `/usr/src/openafs-1.2.7/src/libafs'
make[2]: *** [libafs] Error 2
make[2]: Leaving directory `/usr/src/openafs-1.2.7'
make[1]: *** [build] Error 2
make[1]: Leaving directory `/usr/src/openafs-1.2.7'
make: *** [all] Error 2


--------------------------------

Did I apply the patch incorrectly?  Here's a diff betwrrn the original patch
fule and the newdiff file made by comparing the original source directory
and the patched source directory.  Thanls if anyone can help.

> diff openafs-1.2.7-patch newdiff

2,3c2,3
< --- openafs-1.2.7-orig/acconfig.h     2002-09-11 03:02:15.000000000 -0400
< +++ openafs-1.2.7/acconfig.h  2002-10-18 18:37:09.000000000 -0400
---
> --- openafs-1.2.7-orig/acconfig.h     Wed Sep 11 03:02:15 2002
> +++ openafs-1.2.7/acconfig.h  Thu Oct 31 00:58:59 2002
15,16c15,16
< --- openafs-1.2.7-orig/acinclude.m4   2002-09-25 23:48:52.000000000 -0400
< +++ openafs-1.2.7/acinclude.m4        2002-10-18 18:42:00.000000000 -0400
---
> --- openafs-1.2.7-orig/acinclude.m4   Wed Sep 25 23:48:52 2002
> +++ openafs-1.2.7/acinclude.m4        Thu Oct 31 00:58:59 2002
74,75c74,75
< --- openafs-1.2.7-orig/src/afs/LINUX/osi_module.c     2002-05-02
11:38:45.0000
00000 -0400
< +++ openafs-1.2.7/src/afs/LINUX/osi_module.c  2002-10-18
18:52:13.000000000 -0
400
---
> --- openafs-1.2.7-orig/src/afs/LINUX/osi_module.c     Thu May  2 11:38:45
2002
> +++ openafs-1.2.7/src/afs/LINUX/osi_module.c  Thu Oct 31 00:58:59 2002
203d202
< Only in openafs-1.2.7/src/afs/LINUX: osi_vfs.h
205,206c204,205
< --- openafs-1.2.7-orig/src/cf/linux-test4.m4  2002-09-11
03:02:51.000000000 -0
400
< +++ openafs-1.2.7/src/cf/linux-test4.m4       2002-10-18
18:44:47.000000000 -0
400
---
> --- openafs-1.2.7-orig/src/cf/linux-test4.m4  Wed Sep 11 03:02:51 2002
> +++ openafs-1.2.7/src/cf/linux-test4.m4       Thu Oct 31 00:58:59 2002
278,280d276
< Only in openafs-1.2.7/src/cf: linux-test5.m4
< Only in openafs-1.2.7/src/config: afsconfig.h.in
< Only in openafs-1.2.7/src/config: afsconfig.h.in~
282,283c278,279
< --- openafs-1.2.7-orig/src/libafs/MakefileProto.LINUX.in      2002-06-08
00:47
:42.000000000 -0400
< +++ openafs-1.2.7/src/libafs/MakefileProto.LINUX.in   2002-10-03
12:19:46.0000
00000 -0400
---
> --- openafs-1.2.7-orig/src/libafs/MakefileProto.LINUX.in      Sat Jun  8
00:47
:42 2002
> +++ openafs-1.2.7/src/libafs/MakefileProto.LINUX.in   Thu Oct 31 00:58:59
2002
344,345d339
<
<