* [Buildroot] BR: unable to patch u-boot
@ 2011-03-12 7:44 nataraj at vaaraahi.com
2011-03-14 9:17 ` Thomas Petazzoni
2011-04-26 13:07 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: nataraj at vaaraahi.com @ 2011-03-12 7:44 UTC (permalink / raw)
To: buildroot
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110312/e6e768a0/attachment-0001.html>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] BR: unable to patch u-boot
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
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2011-03-14 9:17 UTC (permalink / raw)
To: buildroot
On Sat, 12 Mar 2011 00:44:18 -0700
<nataraj@vaaraahi.com> wrote:
> |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
> --------------------------
Patches should be generated to be apply with "patch -p1", i.e the paths
in the patch must have an useless training component path. Instead of :
board/atmel/at91sam9263ek/at91sam9263ek.c
you should have
a/board/atmel/at91sam9263ek/at91sam9263ek.c
or
whateveryouwant/board/atmel/at91sam9263ek/at91sam9263ek.c
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] BR: unable to patch u-boot
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
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2011-04-26 13:07 UTC (permalink / raw)
To: buildroot
>>>>> <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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-26 13:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox