Question

Im trying to apply the patch here, I’s saving it as xLoader.patch

http://gitorious.org/x-load-omap3/mainline/commit/ee120c894c3377054bda149748eb0621f2f843c8?format=patch

It modifies more than one file and just won’t go over smoothly from the base dir, I’m using the command below and getting a bunch of errors about hunks failing, how do I correctly do this? Is there a way to break up the file into segments that handle each file independently?

patch -p1 –dry-run -i xLoader.patch

Errors:

x-loader$ patch -p1 --dry-run -i xLoader-512_patch.txt
patching file board/omap3beagle/omap3beagle.c
Hunk #1 succeeded at 310 (offset 45 lines).
Hunk #2 FAILED at 305.
1 out of 2 hunks FAILED -- saving rejects to file board/omap3beagle/omap3beagle.c.rej
patching file drivers/k9f1g08r0a.c
Hunk #1 succeeded at 221 (offset 67 lines).
Hunk #2 FAILED at 185.
1 out of 2 hunks FAILED -- saving rejects to file drivers/k9f1g08r0a.c.rej
patching file include/asm/arch-omap3/mem.h
Hunk #2 FAILED at 72.
Hunk #3 succeeded at 305 (offset 52 lines).
Hunk #4 succeeded at 364 (offset 52 lines).
1 out of 4 hunks FAILED -- saving rejects to file include/asm/arch-omap3/mem.h.rej

Answer 1

If that’s all you need, then yes, it is possible to split it up into a segment for each file it patches. Just split it on the ---/+++ header lines. Each of those segments works perfectly well as an independent patch file.