From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] Set patch parameters
Date: Thu, 3 Oct 2013 20:22:21 +0200 [thread overview]
Message-ID: <20131003182221.GC10079@pengutronix.de> (raw)
In-Reply-To: <CADj18OUDCq+FUdW9i3ig2Jndgi0t=LhAMzCHo=nLb+K6c=ydUA@mail.gmail.com>
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
prev parent reply other threads:[~2013-10-03 18:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-02 13:20 Pascal K
2013-10-03 18:22 ` Uwe Kleine-König [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131003182221.GC10079@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox