- 论坛徽章:
- 0
|
请教patch的用法
[root@mailer linux-2.4.18-3]# patch -p1 -f <bridge-nf-0.0.7-against-2.4.18.diff
patching file include/linux/netfilter.h
Hunk #1 FAILED at 117.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/netfilter.h.rej
patching file include/linux/netfilter_ipv4.h
Hunk #1 FAILED at 54.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/netfilter_ipv4.h.rej
patching file include/linux/skbuff.h
Hunk #1 FAILED at 135.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/skbuff.h.rej
patching file net/Config.in
Hunk #1 FAILED at 61.
1 out of 1 hunk FAILED -- saving rejects to file net/Config.in.rej
patching file net/bridge/Makefile
Hunk #1 succeeded at 37 with fuzz 2 (offset 24 lines).
patching file net/bridge/br.c
Hunk #1 succeeded at 47 with fuzz 2 (offset 5 lines).
Hunk #2 FAILED at 75.
1 out of 2 hunks FAILED -- saving rejects to file net/bridge/br.c.rej
patching file net/bridge/br_forward.c
Hunk #1 FAILED at 30.
Hunk #2 FAILED at 38.
Hunk #3 FAILED at 54.
Hunk #4 FAILED at 65.
4 out of 4 hunks FAILED -- saving rejects to file net/bridge/br_forward.c.rej
patching file net/bridge/br_input.c
Hunk #1 FAILED at 46.
1 out of 1 hunk FAILED -- saving rejects to file net/bridge/br_input.c.rej
The next patch would create the file net/bridge/br_netfilter.c,
which already exists! Applying it anyway.
patching file net/bridge/br_netfilter.c
Patch attempted to create file net/bridge/br_netfilter.c, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file net/bridge/br_netfilter.c.rej
patching file net/bridge/br_private.h
Hunk #1 FAILED at 120.
Hunk #2 FAILED at 145.
Hunk #3 FAILED at 169.
Hunk #4 succeeded at 188 with fuzz 2 (offset 7 lines).
3 out of 4 hunks FAILED -- saving rejects to file net/bridge/br_private.h.rej
patching file net/core/netfilter.c
Hunk #1 FAILED at 343.
Hunk #2 FAILED at 419.
Hunk #3 FAILED at 443.
Hunk #4 FAILED at 462.
Hunk #5 FAILED at 495.
Hunk #6 FAILED at 544.
6 out of 6 hunks FAILED -- saving rejects to file net/core/netfilter.c.rej
patching file net/core/skbuff.c
Hunk #1 FAILED at 231.
Hunk #2 FAILED at 364.
Hunk #3 FAILED at 421.
3 out of 3 hunks FAILED -- saving rejects to file net/core/skbuff.c.rej
patching file net/ipv4/ip_output.c
Hunk #1 FAILED at 819.
Hunk #2 FAILED at 884.
2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/ip_output.c.rej
patching file net/ipv4/netfilter/ip_tables.c
Hunk #1 FAILED at 121.
Hunk #2 FAILED at 159.
Hunk #3 FAILED at 178.
Hunk #4 FAILED at 283.
Hunk #5 FAILED at 293.
Hunk #6 FAILED at 331.
6 out of 6 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_tables.c.rej
patching file net/ipv4/netfilter/ipt_LOG.c
Hunk #1 FAILED at 285.
1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/ipt_LOG.c.rej
好像不行嘛? |
|