From: John Francis Lee (jfl_at_robinlea.com)
Date: Fri 19 Dec 2003 - 08:35:15 GMT
Hello,
I had the 2.4.22 kernel source so I just downloaded the patch to 2.4.23.
I applied the patch-2.4.23 to the linux-2.4.22 source tree, renamed it
to linux-2.4.23 and made a symbolic link to linux, then applied the
2.4.23 owl patch, which went ok, followed by patch-2.2.23-vs1.22 .diff,
with results below.
[root_at_vs0 src]# patch -p0 < patch-2.4.23-vs1.22.diff
patching file linux-2.4.23/Documentation/Configure.help
patching file linux-2.4.23/Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
linux-2.4.23/Makefile.rej
patching file linux-2.4.23/arch/alpha/kernel/entry.S
patching file linux-2.4.23/arch/i386/kernel/entry.S
patching file linux-2.4.23/arch/i386/kernel/ptrace.c
patching file linux-2.4.23/arch/parisc/kernel/syscall.S
patching file linux-2.4.23/arch/ppc/kernel/misc.S
patching file linux-2.4.23/arch/ppc/kernel/ptrace.c
patching file linux-2.4.23/arch/ppc64/kernel/misc.S
patching file linux-2.4.23/arch/ppc64/kernel/ptrace.c
patching file linux-2.4.23/arch/sparc/kernel/systbls.S
patching file linux-2.4.23/arch/sparc64/kernel/entry.S
patching file linux-2.4.23/arch/sparc64/kernel/ptrace.c
patching file linux-2.4.23/arch/sparc64/kernel/systbls.S
patching file linux-2.4.23/arch/x86_64/ia32/ia32entry.S
patching file linux-2.4.23/arch/x86_64/kernel/sys_x86_64.c
patching file linux-2.4.23/drivers/block/Config.in
patching file linux-2.4.23/drivers/block/Makefile
patching file linux-2.4.23/drivers/block/vroot.c
patching file linux-2.4.23/drivers/block/vroot.h
patching file linux-2.4.23/fs/Makefile
patching file linux-2.4.23/fs/devpts/inode.c
patching file linux-2.4.23/fs/devpts/root.c
patching file linux-2.4.23/fs/exec.c
Hunk #1 succeeded at 737 (offset 8 lines).
patching file linux-2.4.23/fs/ext2/ialloc.c
patching file linux-2.4.23/fs/ext2/inode.c
patching file linux-2.4.23/fs/ext2/ioctl.c
patching file linux-2.4.23/fs/ext3/ialloc.c
patching file linux-2.4.23/fs/ext3/inode.c
patching file linux-2.4.23/fs/ext3/ioctl.c
patching file linux-2.4.23/fs/fat/file.c
patching file linux-2.4.23/fs/fat/inode.c
patching file linux-2.4.23/fs/hpfs/file.c
patching file linux-2.4.23/fs/intermezzo/vfs.c
patching file linux-2.4.23/fs/jfs/xattr.c
patching file linux-2.4.23/fs/namei.c
Hunk #1 succeeded at 23 (offset 1 line).
Hunk #3 succeeded at 174 (offset 1 line).
Hunk #4 succeeded at 955 (offset 41 lines).
Hunk #5 succeeded at 1685 (offset 58 lines).
patching file linux-2.4.23/fs/nfsd/vfs.c
patching file linux-2.4.23/fs/open.c
patching file linux-2.4.23/fs/proc/array.c
patching file linux-2.4.23/fs/proc/base.c
Hunk #1 succeeded at 1083 (offset 5 lines).
Hunk #2 succeeded at 1096 (offset 4 lines).
Hunk #3 succeeded at 1132 (offset 5 lines).
patching file linux-2.4.23/fs/quota.c
patching file linux-2.4.23/fs/reiserfs/inode.c
patching file linux-2.4.23/fs/reiserfs/ioctl.c
patching file linux-2.4.23/fs/udf/inode.c
patching file linux-2.4.23/fs/ufs/truncate.c
patching file linux-2.4.23/include/asm-alpha/unistd.h
patching file linux-2.4.23/include/asm-i386/unistd.h
patching file linux-2.4.23/include/asm-parisc/unistd.h
patching file linux-2.4.23/include/asm-ppc/unistd.h
patching file linux-2.4.23/include/asm-ppc64/unistd.h
patching file linux-2.4.23/include/asm-sparc/unistd.h
patching file linux-2.4.23/include/asm-sparc64/unistd.h
patching file linux-2.4.23/include/asm-x86_64/ia32_unistd.h
patching file linux-2.4.23/include/asm-x86_64/unistd.h
patching file linux-2.4.23/include/linux/capability.h
patching file linux-2.4.23/include/linux/devpts_fs_info.h
patching file linux-2.4.23/include/linux/ext2_fs.h
patching file linux-2.4.23/include/linux/ext3_fs.h
patching file linux-2.4.23/include/linux/fs.h
patching file linux-2.4.23/include/linux/major.h
patching file linux-2.4.23/include/linux/reiserfs_fs.h
patching file linux-2.4.23/include/linux/sched.h
Hunk #5 succeeded at 521 (offset 2 lines).
patching file linux-2.4.23/include/linux/sys.h
patching file linux-2.4.23/include/linux/sysctl.h
patching file linux-2.4.23/include/linux/vcontext.h
patching file linux-2.4.23/include/linux/vswitch.h
patching file linux-2.4.23/include/net/ip.h
patching file linux-2.4.23/include/net/route.h
patching file linux-2.4.23/include/net/sock.h
patching file linux-2.4.23/include/net/tcp.h
patching file linux-2.4.23/ipc/util.c
patching file linux-2.4.23/ipc/util.h
patching file linux-2.4.23/kernel/Makefile
patching file linux-2.4.23/kernel/exit.c
Hunk #2 succeeded at 70 (offset 3 lines).
Hunk #4 succeeded at 185 (offset 3 lines).
patching file linux-2.4.23/kernel/fork.c
patching file linux-2.4.23/kernel/printk.c
patching file linux-2.4.23/kernel/sched.c
patching file linux-2.4.23/kernel/signal.c
patching file linux-2.4.23/kernel/sys.c
patching file linux-2.4.23/kernel/sysctl.c
Hunk #4 succeeded at 421 (offset 3 lines).
patching file linux-2.4.23/kernel/timer.c
patching file linux-2.4.23/kernel/user.c
patching file linux-2.4.23/kernel/vcontext.c
patching file linux-2.4.23/kernel/vswitch.c
patching file linux-2.4.23/net/ipv4/af_inet.c
patching file linux-2.4.23/net/ipv4/devinet.c
patching file linux-2.4.23/net/ipv4/raw.c
patching file linux-2.4.23/net/ipv4/tcp_ipv4.c
patching file linux-2.4.23/net/ipv4/tcp_minisocks.c
patching file linux-2.4.23/net/ipv4/udp.c
patching file linux-2.4.23/net/ipv6/raw.c
patching file linux-2.4.23/net/ipv6/tcp_ipv6.c
patching file linux-2.4.23/net/ipv6/udp.c
patching file linux-2.4.23/net/unix/af_unix.c
The rejected hunk seems just to have been versioning information which
failed because the version was already extended by "-owl". I extended it
by hand to "-owl-vs1.22".
I'm pretty sure that's ok.
What about those offsets?
Thanks for your help.
-- John Francis Lee <jfl_at_robinlea.com>_______________________________________________ Vserver mailing list Vserver_at_list.linux-vserver.org http://list.linux-vserver.org/mailman/listinfo/vserver