Modify

Opened 6 years ago

Closed 6 years ago

Last modified 4 years ago

#10965 closed defect (fixed)

brcm 2.4 Changeset 30306 broke patching 615-netfilter_nat_mms.patch

Reported by: anonymous Owned by: developers
Priority: normal Milestone: Chaos Calmer 15.05
Component: other Version: Backfire 10.03
Keywords: Cc:

Description

Compiling Backfire, brcm 2.4 target.
It seems that the removal of the 614-netfilter_nat_rtsp.patch with revision #30306 broke patching of 615-netfilter_nat_mms.patch.

Error:

target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch using plaintext: 
patching file net/ipv4/netfilter/Config.in
Hunk #1 FAILED at 15.
Hunk #2 succeeded at 88 with fuzz 1 (offset -8 lines).
1 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/Config.in.rej
patching file net/ipv4/netfilter/Makefile
Hunk #1 succeeded at 51 with fuzz 2 (offset -4 lines).
Hunk #2 FAILED at 68.
1 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/Makefile.rej
patching file net/ipv4/netfilter/ip_conntrack_mms.c
patching file net/ipv4/netfilter/ip_nat_mms.c
patching file include/linux/netfilter_ipv4/ip_conntrack.h
Hunk #1 FAILED at 69.
Hunk #2 FAILED at 78.
Hunk #3 FAILED at 93.
3 out of 3 hunks FAILED -- saving rejects to file include/linux/netfilter_ipv4/ip_conntrack.h.rej

Attachments (1)

615-netfilter_nat_mms-new.tar (25.5 KB) - added by anonymous 6 years ago.
New working 615-netfilter_nat_mms.patch

Download all attachments as: .zip

Change History (4)

Changed 6 years ago by anonymous

New working 615-netfilter_nat_mms.patch

comment:1 Changed 6 years ago by anonymous

This ticket can ble closed.
jow have fixed it.

comment:2 Changed 6 years ago by jow

  • Resolution set to fixed
  • Status changed from new to closed

comment:3 Changed 4 years ago by jow

  • Milestone changed from Backfire 10.03.2 to Chaos Calmer (trunk)

Milestone Backfire 10.03.2 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.