From: Wray Cason (wrayman_at_auxiliumcomputing.com)
Date: Mon 12 May 2003 - 08:09:21 BST
> On Thu, 2003-05-08 at 00:26, Wray Cason wrote:
> [SNIP]
> > This is the first occasion I have had to patch a kernel. Good stuff. I am a
> > bit confused on one point however. I am using patch-2.4.20ctx-17. The patch
> > is obviously not meant for the vanilla 2.4.20 kernel since there is a bunch of
> > file system stuff in the patch that isn't in the kernel. I applied the patch
> > to the RH 2.4.20-9 kernel and got several .rej's.
> >
> > What kernel is this patch meant for exactly? 2.4.20 + other patches?
> >
> this patch:
> ftp://ftp.solucorp.qc.ca/pub/vserver/patch-2.4.20ctx-17.gz
>
> is meant for the 2.4.20-vanilla kernel - and it applies just fine for
> me.
>
> How are you patching?
I am patching like so:
# cat ../patch-2.4.20ctx-17 |patch -p1
patching file arch/i386/kernel/entry.S
Hunk #1 succeeded at 657 with fuzz 2 (offset -1 lines).
patching file arch/i386/kernel/ptrace.c
Hunk #1 succeeded at 158 (offset -13 lines).
patching file arch/ppc/kernel/misc.S
Hunk #1 succeeded at 1185 with fuzz 2.
patching file arch/ppc/kernel/ptrace.c
Hunk #1 succeeded at 103 (offset -76 lines).
patching file arch/sparc/kernel/systbls.S
patching file arch/sparc64/kernel/entry.S
Hunk #1 succeeded at 25 (offset -1 lines).
patching file arch/sparc64/kernel/ptrace.c
Hunk #1 FAILED at 157.
1 out of 1 hunk FAILED -- saving rejects to file arch/sparc64/kernel/ptrace.c.rej
patching file arch/sparc64/kernel/systbls.S
patching file fs/devpts/inode.c
patching file fs/devpts/root.c
Hunk #3 succeeded at 105 with fuzz 1.
Hunk #4 FAILED at 132.
1 out of 4 hunks FAILED -- saving rejects to file fs/devpts/root.c.rej
patching file fs/exec.c
Hunk #1 succeeded at 674 (offset -32 lines).
patching file fs/ext2/ialloc.c
Hunk #1 FAILED at 389.
1 out of 1 hunk FAILED -- saving rejects to file fs/ext2/ialloc.c.rej
patching file fs/ext2/inode.c
Hunk #1 succeeded at 40 (offset -7 lines).
Hunk #3 succeeded at 868 (offset 79 lines).
Hunk #5 succeeded at 958 with fuzz 1 (offset 81 lines).
patching file fs/ext2/ioctl.c
can't find file to patch at input line 405
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -rc2P linux-2.4.20/fs/ext3/ialloc.c linux-2.4.20ctx-17/fs/ext3/ialloc.c
|*** linux-2.4.20/fs/ext3/ialloc.c 2002-12-09 10:32:04.000000000 -0500
|--- linux-2.4.20ctx-17/fs/ext3/ialloc.c 2003-03-29 21:13:24.000000000
-0500
--------------------------
File to patch:
The first odd thing I noticed was the fact that the vanilla kernel unpacks
into kernel, linux-2.4.20 as the patch expects. Not a big problem. But then
as you can see, it goes to patch several fs files that don't exist in the
kernel tree. I am working with the linux-2.4.0.tar.bz2 file from kernel.org.
Many thanks for the help.
> --
> Regards,
> Klavs Klavsen, GSEC - kl_at_vsen.dk - http://www.vsen.dk
>
> Working with Unix is like wrestling a worthy opponent.
> Working with windows is like attacking a small whining child
> who is carrying a .38.
-- Wray Cason "Wrayman" Auxilium Computing www.auxiliumcomputing.com wrayman_at_auxiliumcomputing.com main: 206-595-2080 fax: 425-895-9825