Hello everyone,
I am creating a patch accross several folders.
For this I use:
diff -ruN ${FOLDER1} ${FOLDER2} > file.patch
which fails with error:
applying '0039-pcm051-Add-pin-mux-for-user-BNTs.patch'
patching file arch/arm/mach-omap2/board-pcm051.c
Hunk #1 succeeded at 389 (offset 6 lines).
patching file arch/arm/mach-omap2/mux33xx.c
applying '0040-file.patch'
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ruN
/opt/PHYTEC_BSPs/phyCORE-AM335x/platform-phyCORE-AM335x/build-target/linux-3.2/drivers/leds/Kconfig
/opt/temp/Diff/leds_new/Kconfig
|---
/opt/PHYTEC_BSPs/phyCORE-AM335x/platform-phyCORE-AM335x/build-target/linux-3.2/drivers/leds/Kconfig
2012-01-05
00:55:44.000000000 +0100
|+++ /opt/temp/Diff/leds_new/Kconfig 2013-09-30 11:56:20.300166000 +0200
Now I wan't to set the option -p0 for applying the patch, but where is the
correct point for invoking this parameter?
Best regards,
Pascal
--
ptxdist mailing list
[email protected]
