Modify

Opened 9 years ago

Closed 9 years ago

Last modified 4 years ago

#5089 closed defect (invalid)

brcm47xx/2.6 fails applying patches

Reported by: candrews@… Owned by: developers
Priority: normal Milestone: Barrier Breaker 14.07
Component: base system Version: Trunk
Keywords: Cc:

Description

When trying to make brcm47xx with a 2.6 kernel from trunk (not the kamikaze branch), a bunch of patches fail to apply. I believe this started happening when the kernel revision was bumped to 2.6.28.10.

make[4]: Entering directory `/home/candrews/kamikaze/target/linux/brcm47xx'
if [ -s "/home/candrews/kamikaze/build_dir/linux-brcm47xx/linux-2.6.28.10/patches/series" ]; then (cd "/home/candrews/kamikaze/build_dir/linux-brcm47xx/linux-2.6.28.10"; if quilt --quiltrc=- next >/dev/null 2>&1; then quilt --quiltrc=- push -a; else quilt --quiltrc=- top >/dev/null 2>&1; fi ); fi
Applying patch generic/120-netfilter_upstream_fixes.patch
patching file net/ipv4/netfilter/arp_tables.c
Hunk #1 FAILED at 374.
1 out of 1 hunk FAILED -- rejects in file net/ipv4/netfilter/arp_tables.c
patching file net/ipv4/netfilter/ip_tables.c
Hunk #5 FAILED at 532.
1 out of 5 hunks FAILED -- rejects in file net/ipv4/netfilter/ip_tables.c
patching file net/ipv6/netfilter/ip6_tables.c
Hunk #1 FAILED at 525.
1 out of 1 hunk FAILED -- rejects in file net/ipv6/netfilter/ip6_tables.c
Patch generic/120-netfilter_upstream_fixes.patch does not apply (enforce with -f)
make[4]: *** [/home/candrews/kamikaze/build_dir/linux-brcm47xx/linux-2.6.28.10/.quilt_checked] Error 1

Attachments (1)

.config (87.9 KB) - added by Craig <candrews@…> 9 years ago.
My .config that produces this error

Download all attachments as: .zip

Change History (3)

Changed 9 years ago by Craig <candrews@…>

My .config that produces this error

comment:1 Changed 9 years ago by hauke

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

The patch you want to apply is no longer included in kamikaze trunk.

It was removed with commit r15655. Please try a newer version of trunk or remove: target/linux/generic-2.6/patches-2.6.28/120-netfilter_upstream_fixes.patch

comment:2 Changed 4 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 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.