From: Peter Korsgaard <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] BR: unable to patch u-boot
Date: Tue, 26 Apr 2011 15:07:35 +0200 [thread overview]
Message-ID: <87aafd5ffs.fsf@macbook.be.48ers.dk> (raw)
In-Reply-To: <20110312004418.ed0f21fc085cea67a12906c6b8e6fb44.de35470e4e.wbe@email10.secureserver.net> (nataraj@vaaraahi.com's message of "Sat, 12 Mar 2011 00:44:18 -0700")
>>>>> <nataraj@vaaraahi.com> 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
prev parent reply other threads:[~2011-04-26 13:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-12 7:44 [Buildroot] BR: unable to patch u-boot nataraj at vaaraahi.com
2011-03-14 9:17 ` Thomas Petazzoni
2011-04-26 13:07 ` Peter Korsgaard [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=87aafd5ffs.fsf@macbook.be.48ers.dk \
--to=jacmet@uclibc.org \
--cc=buildroot@busybox.net \
/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