From: Charles Dale (bug_at_aphid.net)
Date: Thu 13 Nov 2003 - 03:45:38 GMT
Given no one seems to care about us poor Red Hat weenies who want to use our
gimboid Red Hat patched kernels (sound of weeping and moaning)... I've
decided to Become a Kernel Hacker. Sorry everyone!
I had a vain hope that I might be able to just wack the stock 2.4.20 vserver
v1.0 patch on the Red Hat patched kernel. Nooooo... I got these rejects:
[root_at_me /usr/src/linux-2.4.20-20.9]# find . -name \*.rej
./arch/i386/kernel/entry.S.rej
./arch/x86_64/ia32/ia32entry.S.rej
./fs/proc/array.c.rej
./fs/proc/base.c.rej
./fs/dquot.c.rej
./include/asm-i386/unistd.h.rej
./include/asm-ppc/unistd.h.rej
./include/asm-x86_64/unistd.h.rej
./include/linux/sys.h.rej
./kernel/exit.c.rej
./kernel/fork.c.rej
./kernel/signal.c.rej
./kernel/user.c.rej
./kernel/sched.c.rej
./kernel/timer.c.rej
./net/ipv4/tcp_ipv4.c.rej
./net/ipv4/udp.c.rej
./net/socket.c.rej
./Makefile.rej
I can fix the Makefile reject... The others I'm not so sure about...
Can someone give me pointers on where to start trying to resolve these?
I had a look at some of them. Oftentimes it just seems to be a change in
nomenclature between the stock 2.4.20 and the RH kernel. E.g. the p_opptr
struct member seems to have changed to parent or similar in the RH kernel,
so the patch doesn't match. However I can't work out what the vserver change
is meant to do so I can't work out how to change it...
So ahm yeah I'm sorry that I've had to do this but I really want a running
kernel with NPTL etc... Looks like there would be a number of others
interested too. I'm not interested in changing anything further than getting
the patch to work (as seems to have happened to the previous attempt at
modifying the patch for a RH kernel).
Cheers!
Chuck
P.S. here's the full patch output:
# patch -p1 < ../split-2.4.20-vs1.00/01_2.4.20_base.diff
patching file Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file arch/i386/kernel/ptrace.c
Hunk #1 succeeded at 251 (offset 81 lines).
patching file arch/ppc/kernel/ptrace.c
patching file arch/sparc64/kernel/ptrace.c
patching file fs/devpts/inode.c
patching file fs/devpts/root.c
patching file fs/dquot.c
Hunk #1 FAILED at 1403.
1 out of 1 hunk FAILED -- saving rejects to file fs/dquot.c.rej
patching file fs/exec.c
Hunk #1 succeeded at 851 (offset 146 lines).
patching file fs/namei.c
patching file fs/proc/array.c
Hunk #3 FAILED at 164.
Hunk #4 succeeded at 273 (offset 1 line).
Hunk #6 FAILED at 396.
2 out of 6 hunks FAILED -- saving rejects to file fs/proc/array.c.rej
patching file fs/proc/base.c
Hunk #1 succeeded at 1056 with fuzz 1 (offset 37 lines).
Hunk #2 FAILED at 1106.
1 out of 2 hunks FAILED -- saving rejects to file fs/proc/base.c.rej
patching file include/linux/capability.h
patching file include/linux/devpts_fs_info.h
patching file include/linux/fs.h
Hunk #1 succeeded at 322 (offset 2 lines).
Hunk #2 succeeded at 513 (offset 2 lines).
patching file include/linux/sched.h
Hunk #1 succeeded at 365 with fuzz 2 (offset 91 lines).
Hunk #2 succeeded at 284 with fuzz 2 (offset 2 lines).
Hunk #3 succeeded at 557 with fuzz 1 (offset 92 lines).
Hunk #4 succeeded at 646 with fuzz 2 (offset 72 lines).
Hunk #5 succeeded at 686 with fuzz 1 (offset 47 lines).
Hunk #6 succeeded at 1055 with fuzz 2 (offset 48 lines).
patching file ipc/util.h
patching file kernel/exit.c
Hunk #1 FAILED at 66.
Hunk #2 FAILED at 161.
Hunk #3 FAILED at 180.
3 out of 3 hunks FAILED -- saving rejects to file kernel/exit.c.rej
patching file kernel/fork.c
Hunk #1 FAILED at 603.
Hunk #2 FAILED at 616.
2 out of 2 hunks FAILED -- saving rejects to file kernel/fork.c.rej
patching file kernel/printk.c
Hunk #1 succeeded at 173 (offset 1 line).
patching file kernel/signal.c
Hunk #1 FAILED at 596.
Hunk #2 FAILED at 652.
Hunk #3 FAILED at 689.
Hunk #4 FAILED at 1314.
4 out of 4 hunks FAILED -- saving rejects to file kernel/signal.c.rej
patching file kernel/sys.c
[oops, Vim wrote over the terminal buffer so I don't have the rest of this
one]
# patch -p1 < ../split-2.4.20-vs1.00/02_2.4.20_syscall.diff
patching file arch/alpha/kernel/entry.S
Hunk #1 succeeded at 1052 (offset 8 lines).
patching file arch/i386/kernel/entry.S
Hunk #1 FAILED at 657.
1 out of 1 hunk FAILED -- saving rejects to file
arch/i386/kernel/entry.S.rej
patching file arch/ppc/kernel/misc.S
patching file arch/sparc/kernel/systbls.S
patching file arch/sparc64/kernel/entry.S
patching file arch/sparc64/kernel/systbls.S
patching file arch/x86_64/ia32/ia32entry.S
Hunk #1 FAILED at 366.
1 out of 1 hunk FAILED -- saving rejects to file
arch/x86_64/ia32/ia32entry.S.rej
patching file include/asm-alpha/unistd.h
patching file include/asm-i386/unistd.h
Hunk #1 FAILED at 257.
1 out of 1 hunk FAILED -- saving rejects to file
include/asm-i386/unistd.h.rej
patching file include/asm-ppc/unistd.h
Hunk #1 FAILED at 241.
1 out of 1 hunk FAILED -- saving rejects to file
include/asm-ppc/unistd.h.rej
patching file include/asm-sparc/unistd.h
patching file include/asm-sparc64/unistd.h
patching file include/asm-x86_64/unistd.h
Hunk #1 FAILED at 483.
1 out of 1 hunk FAILED -- saving rejects to file
include/asm-x86_64/unistd.h.rej
patching file include/linux/sys.h
Hunk #1 FAILED at 4.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/sys.h.rej
# patch -p1 < ../split-2.4.20-vs1.00/03_2.4.20_sched.diff
patching file fs/devpts/inode.c
patching file fs/devpts/root.c
patching file kernel/sched.c
Hunk #1 FAILED at 165.
Hunk #2 FAILED at 624.
2 out of 2 hunks FAILED -- saving rejects to file kernel/sched.c.rej
patching file kernel/timer.c
Hunk #1 FAILED at 599.
1 out of 1 hunk FAILED -- saving rejects to file kernel/timer.c.rej
[No rejects with 04_2.4.20_ili.diff!!! Hoorah!]
# patch -p1 < ../split-2.4.20-vs1.00/05_2.4.20_net.diff
patching file include/net/route.h
patching file include/net/sock.h
Hunk #1 succeeded at 498 (offset 11 lines).
Hunk #3 succeeded at 539 (offset 11 lines).
Hunk #4 succeeded at 673 with fuzz 1.
patching file include/net/tcp.h
Hunk #1 succeeded at 173 (offset 1 line).
patching file ipc/util.c
patching file net/ipv4/af_inet.c
patching file net/ipv4/devinet.c
Hunk #4 succeeded at 965 (offset 24 lines).
patching file net/ipv4/raw.c
patching file net/ipv4/tcp_ipv4.c
Hunk #1 succeeded at 180 (offset 6 lines).
Hunk #2 succeeded at 230 (offset 1 line).
Hunk #3 succeeded at 454 (offset 6 lines).
Hunk #4 FAILED at 497.
Hunk #5 FAILED at 527.
Hunk #7 succeeded at 2311 (offset 6 lines).
2 out of 8 hunks FAILED -- saving rejects to file net/ipv4/tcp_ipv4.c.rej
patching file net/ipv4/tcp_minisocks.c
Hunk #2 succeeded at 654 (offset 2 lines).
patching file net/ipv4/udp.c
Hunk #1 succeeded at 110 (offset 4 lines).
Hunk #2 succeeded at 164 with fuzz 2 (offset 1 line).
Hunk #3 succeeded at 210 (offset 4 lines).
Hunk #4 FAILED at 240.
Hunk #5 FAILED at 296.
Hunk #6 succeeded at 544 (offset 7 lines).
Hunk #7 succeeded at 1038 (offset 4 lines).
2 out of 7 hunks FAILED -- saving rejects to file net/ipv4/udp.c.rej
patching file net/ipv6/raw.c
patching file net/ipv6/tcp_ipv6.c
Hunk #1 succeeded at 2027 (offset 21 lines).
Hunk #3 succeeded at 2094 (offset 21 lines).
patching file net/ipv6/udp.c
Hunk #1 succeeded at 979 (offset 22 lines).
patching file net/socket.c
Hunk #1 FAILED at 1754.
1 out of 1 hunk FAILED -- saving rejects to file net/socket.c.rej
patching file net/unix/af_unix.c
_______________________________________________
Vserver mailing list
Vserver_at_list.linux-vserver.org
http://list.linux-vserver.org/mailman/listinfo/vserver