<div dir="ltr"><div><div>Hi Peter,<br><br>Unfortunately sometimes it is needed to manually switch branches on the build system (I am not sure if it is due to trees that have git commit -f or if it is an internal issue within the build system).<br><br></div>Please try switch manually to branch 4.2.y or remove the entire 'src' folder under 'rpi' target. Let me know if it works?<br><br></div><div>Regards,<br></div><div>Vinicius<br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Aug 12, 2015 at 6:37 AM, Jan-Simon Moeller <span dir="ltr"><<a href="mailto:dl9pf@gmx.de" target="_blank">dl9pf@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Patching works for me fine.<br>
<br>
can you do:<br>
<br>
cd target/rpi2<br>
rm -rf *<br>
git remote -v update<br>
git reset --hard origin/master<br>
make V=1 2>&1 | tee -a logfile<br>
<br>
and in case it fails, please send me the logfile.<br>
<br>
Tnx.<br>
<div><div class="h5"><br>
<br>
Am Mittwoch, 12. August 2015, 11:01:43 schrieb Peter Teoh:<br>
> Got the following errors when I attempt make in target rp2:<br>
><br>
> patching file Makefile<br>
> Hunk #1 succeeded at 378 (offset 12 lines).<br>
> Hunk #2 FAILED at 667.<br>
> 1 out of 2 hunks FAILED -- rejects in file Makefile<br>
> Patch kbuild-clang-detect.patch does not apply (enforce with -f)<br>
> make: *** [state/kernel-patch] Error 1<br>
><br>
> Even after getting the latest git pull from llvmlinux I still got the<br>
> errors (as shown in git log below, which I supposed are to solve the above<br>
> problem):<br>
><br>
><br>
> commit 2a8813e233c63684a630e765c70b2d550c2b2884<br>
> Author: Vinicius Tinti <<a href="mailto:viniciustinti@gmail.com">viniciustinti@gmail.com</a>><br>
> Date: Tue Aug 11 19:36:01 2015 -0300<br>
><br>
> rpi2: update to kernel 4.2<br>
><br>
> Signed-off-by: Vinicius Tinti <<a href="mailto:viniciustinti@gmail.com">viniciustinti@gmail.com</a>><br>
><br>
> commit 6c6f5a473ce14a3766a906c7f3a15ae3df78ed6e<br>
> Author: Vinicius Tinti <<a href="mailto:viniciustinti@gmail.com">viniciustinti@gmail.com</a>><br>
> Date: Tue Aug 11 18:42:16 2015 -0300<br>
><br>
> rpi: update to kernel 4.2<br>
><br>
> Signed-off-by: Vinicius Tinti <<a href="mailto:viniciustinti@gmail.com">viniciustinti@gmail.com</a>><br>
><br>
><br>
> Can someone provide the instruction on how to properly restart the<br>
> compilation?<br>
><br>
> I have tried the following in succession:<br>
><br>
> cd toolchain/clang && make clean && make<br>
><br>
> cd targets/rpi2 && make clean && make<br>
><br>
> But thereafter it still gave me errors.<br>
<br>
</div></div>_______________________________________________<br>
LLVMLinux mailing list<br>
<a href="mailto:LLVMLinux@lists.linuxfoundation.org">LLVMLinux@lists.linuxfoundation.org</a><br>
<a href="https://lists.linuxfoundation.org/mailman/listinfo/llvmlinux" rel="noreferrer" target="_blank">https://lists.linuxfoundation.org/mailman/listinfo/llvmlinux</a><br>
</blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature"><div dir="ltr">Simplicity is the ultimate sophistication<br></div></div>
</div>