From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Tue, 26 Apr 2011 15:07:35 +0200 Subject: [Buildroot] BR: unable to patch u-boot In-Reply-To: <20110312004418.ed0f21fc085cea67a12906c6b8e6fb44.de35470e4e.wbe@email10.secureserver.net> (nataraj@vaaraahi.com's message of "Sat, 12 Mar 2011 00:44:18 -0700") References: <20110312004418.ed0f21fc085cea67a12906c6b8e6fb44.de35470e4e.wbe@email10.secureserver.net> Message-ID: <87aafd5ffs.fsf@macbook.be.48ers.dk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net >>>>> writes: > Hi > Unable to patch u-boot-2010.06 from a patch file generated by git diff, > specifically on the > "@@ -350,3 +358,25 @@" etc > The make log:- > mkdir -p /buildroot/output/build/u-boot-2010.06 > bzcat /buildroot/dl/u-boot-2010.06.tar.bz2 \ > | tar --strip-components=1 -C /buildroot/output/build/u-boot-2010.06 -xf - > touch /buildroot/output/build/u-boot-2010.06/.unpacked > toolchain/patch-kernel.sh /buildroot/output/build/u-boot-2010.06 boot/u-boot \ > u-boot-2010.06-\*.patch \ > u-boot-2010.06-\*.patch.arm > toolchain/patch-kernel.sh /buildroot/output/build/u-boot-2010.06 "/var/u-boot" > u-boot-2010.06-\*.patch > Applying u-boot-2010.06-vaaraahi.patch using plaintext: > can't find file to patch at input line 5 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git board/atmel/at91sam9263ek/at91sam9263ek.c board/atmel/at91sam9263ek > /at91sam9263ek.c > |index 5cd7aa7..94b80b4 100644 > |--- board/atmel/at91sam9263ek/at91sam9263ek.c > |+++ board/atmel/at91sam9263ek/at91sam9263ek.c > -------------------------- > How do I fix this? Fix your patch? Buildroot expects patches that can be applied with patch -p1, you seem to missing a directory level. -- Bye, Peter Korsgaard