[ptxdist] Set patch parameters

[ptxdist] Set patch parameters

[Pascal K]

[-- Attachment #1.1: Type: text/plain, Size: 1022 bytes --]

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

[-- Attachment #1.2: Type: text/html, Size: 1526 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Set patch parameters

[Uwe Kleine-König]

On Wed, Oct 02, 2013 at 03:20:55PM +0200, Pascal K wrote:
> 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?
You should not use absolute paths when creating the patches. With the
patch shown above application would fail with -p0, too. If you were
using quilt or git you'd get this right automatically. I'm sure this is
described in the Guru Guide.
For completeness sake, you can pass -p0 in the series files after the
patch name. Grep for "-p0" in ptxdist for find some examples.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de