|
On Thu, Oct 23, 2003 at 08:14:09PM +1000, Alan Knipmeyer wrote:
> Hiya,
>
> I must be missing something obvious here, but am at my whits end, when
> trying to patch linux-2.4.20 (clean kernel) with antefacto patch, I get
> the following :-
>
> cd /usr/src/linux-2.4.20
> patch -p1 </opt/antefacto/lin^Gux-2.4.20-ipvs-1.0.8-antefactoo.patch
> patching file include/linux/netfilter_ipv4/ip_nat.h
> patching file kernel/ksyms.c
> Hunk #1 FAILED at 127.
> 1 out of 1 hunk FAILED -- saving rejects to file kernel/ksyms.c.rej
> can't find file to patch at input line 28
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff -Naurp linux-2.4.20-ipvs-1.0.8/net/ipv4/ipvs/ip_vs_conn.c
> linux-2.4.20-ipvs-1.0.8-antefacto/net/ipv4/ipvs/ip_vs_conn.c
> |--- linux-2.4.20-ipvs-1.0.8/net/ipv4/ipvs/ip_vs_conn.c 2003-04-15
> 01:33:39.000000000 +0200
> |+++ linux-2.4.20-ipvs-1.0.8-antefacto/net/ipv4/ipvs/ip_vs_conn.c
> 2003-04-15 01:36:33.000000000 +0200
> --------------------------
> File to patch:
> # cd kernel/
> vi ksyms.c.rej
>
> ***************
> *** 127,132 ****
> EXPORT_SYMBOL(kmap_prot);
> EXPORT_SYMBOL(kmap_pte);
> #endif
> EXPORT_SYMBOL(buffermem_pages);
> EXPORT_SYMBOL(nr_free_pages);
> EXPORT_SYMBOL(page_cache_size);
> --- 127,133 ----
> EXPORT_SYMBOL(kmap_prot);
> EXPORT_SYMBOL(kmap_pte);
> #endif
> +
> EXPORT_SYMBOL(buffermem_pages);
> EXPORT_SYMBOL(nr_free_pages);
> EXPORT_SYMBOL(page_cache_size);
>
> I`ve read the LVS-NAT director docs, and am following them through, but
> get the same result. Can someone please tell me what i`m missing before
> i go bald :)
It looks like you are using a slightly different kernel version
to the one that the patch was generated from and that is causing
the patch command to become confused.
Just look at the diff and make the changes manually for ksyms.c
--
Horms
|
