From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1VRMMP-0001hd-5i for ptxdist@pengutronix.de; Wed, 02 Oct 2013 15:21:03 +0200 Received: by mail-la0-f46.google.com with SMTP id eh20so611412lab.5 for ; Wed, 02 Oct 2013 06:20:55 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 2 Oct 2013 15:20:55 +0200 Message-ID: From: Pascal K Subject: [ptxdist] Set patch parameters Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0488712734==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de --===============0488712734== Content-Type: multipart/alternative; boundary=001a11c365b66bbfc304e7c1f085 --001a11c365b66bbfc304e7c1f085 Content-Type: text/plain; charset=ISO-8859-1 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 --001a11c365b66bbfc304e7c1f085 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Hello everyone,=A0

I am creating a patc= h accross several folders.=A0

For this I use:=A0

diff -ruN ${FOLDER1} ${FOLDER2} > file.patch
=


which fails with error:=A0

applying '0039-pcm051-Add-pin-mux-for-user-BNTs.patch&= #39;
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 t= he wrong -p or --strip option?
The text leading up to this was:
--------------------------<= /div>
|diff -ruN /opt/PHYTEC_BSPs/phyCORE-AM335x/platform-phyCORE-AM335= x/build-target/linux-3.2/drivers/leds/Kconfig /opt/temp/Diff/leds_new/Kconf= ig
|--- /opt/PHYTEC_BSPs/phyCORE-AM335x/platform-phyCORE-AM335x/build-tar= get/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 f= or invoking this parameter?=A0

Best regards,=A0
Pascal
--001a11c365b66bbfc304e7c1f085-- --===============0488712734== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0488712734==--