From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <ukl@pengutronix.de>) id 1VRnXZ-0005WC-A3
	for ptxdist@pengutronix.de; Thu, 03 Oct 2013 20:22:21 +0200
Received: from ukl by dude.hi.pengutronix.de with local (Exim 4.80)
	(envelope-from <ukl@pengutronix.de>) id 1VRnXZ-0003VD-98
	for ptxdist@pengutronix.de; Thu, 03 Oct 2013 20:22:21 +0200
Date: Thu, 3 Oct 2013 20:22:21 +0200
From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= <u.kleine-koenig@pengutronix.de>
Message-ID: <20131003182221.GC10079@pengutronix.de>
References: <CADj18OUDCq+FUdW9i3ig2Jndgi0t=LhAMzCHo=nLb+K6c=ydUA@mail.gmail.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <CADj18OUDCq+FUdW9i3ig2Jndgi0t=LhAMzCHo=nLb+K6c=ydUA@mail.gmail.com>
Subject: Re: [ptxdist] Set patch parameters
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

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/linu=
x-3.2/drivers/leds/Kconfig
> /opt/temp/Diff/leds_new/Kconfig
> |---
> /opt/PHYTEC_BSPs/phyCORE-AM335x/platform-phyCORE-AM335x/build-target/linu=
x-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=F6nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-- =

ptxdist mailing list
ptxdist@pengutronix.de