Prevent mbed's main_nat.patch from applying twice

sprhawk / python-on-a-chip

Automatically exported from code.google.com/p/python-on-a-chip

Other

0 stars 0 forks source link

Prevent mbed's main_nat.patch from applying twice #113

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago

If you make mbed once, the main_nat.patch is applied to main_nat.c.  If you 
make mbed again, the patch is applied again and that results in errors in 
main_nat.c when compiled.

Original issue reported on code.google.com by dwhall...@gmail.com on 3 Aug 2010 at 3:36

GoogleCodeExporter commented 9 years ago

Had to create a patch file with context (patch -c file.orig file.mod > 
file.patch).  Only with context, will the -N argument to patch work.
Added -N arg to patch in Makefile.

Original comment by dwhall...@gmail.com on 3 Aug 2010 at 4:21

Changed state: Started

GoogleCodeExporter commented 9 years ago

r541
Created new patch file with context
Edited Makefile to prevent patch from being applied, using -N argument.

Tested manually.

Original comment by dwhall...@gmail.com on 3 Aug 2010 at 4:22

Changed state: Fixed

GoogleCodeExporter commented 9 years ago

Post mainline checkin:
r546
- Unified context patch seems to work better (without error)
- Changed Makefile so if patch detects applying a 2nd time, error is ignored.

Original comment by dwhall...@gmail.com on 3 Aug 2010 at 5:14