<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"Segoe UI Symbol";
panose-1:2 11 5 2 4 2 4 2 2 3;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D">Cool, thanks!<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D">Alejandro<o:p></o:p></span></p>
<p class="MsoNormal"><a name="_MailEndCompose"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D"><o:p> </o:p></span></a></p>
<p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Burton, Ross [mailto:ross.burton@intel.com]
<br>
<b>Sent:</b> Friday, February 2, 2018 1:35 PM<br>
<b>To:</b> Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com><br>
<b>Cc:</b> openembedded-core@lists.openembedded.org<br>
<b>Subject:</b> Re: [OE-core] </span><span style="font-size:11.0pt;font-family:"Segoe UI Symbol",sans-serif">✗</span><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> patchtest: failure for ninja: Upgrade from 1.7.2 to major release 1.8.2 (rev2)<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">So I'm 99% sure this is Exchange tramping the mail and git not handling that, as the patch is quoted-printable encoded. I'll pick from the branch :)<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Ross<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On 2 February 2018 at 21:28, Alejandro Enedino Hernandez Samaniego <<a href="mailto:alejandro.enedino.hernandez-samaniego@xilinx.com" target="_blank">alejandro.enedino.hernandez-samaniego@xilinx.com</a>> wrote:<o:p></o:p></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<div>
<p>I might be wrong but you can check it here as well:<o:p></o:p></p>
<p class="MsoNormal"><a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=aehs29/ninja" target="_blank">https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=aehs29/ninja</a><o:p></o:p></p>
<div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><br>
<br>
<o:p></o:p></p>
<div>
<p class="MsoNormal">On 02/02/2018 01:22 PM, Alejandro Enedino Hernandez Samaniego wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p>This is what I got:<o:p></o:p></p>
<p><o:p> </o:p></p>
<p>$ git remote show origin<br>
* remote origin<br>
Fetch URL: git://<a href="http://git.yoctoproject.org/poky" target="_blank">git.yoctoproject.org/poky</a><br>
Push URL: git://<a href="http://git.yoctoproject.org/poky" target="_blank">git.yoctoproject.org/poky</a><br>
HEAD branch: master<o:p></o:p></p>
<p>latest commit:<o:p></o:p></p>
<p>bca260ef4dca87c11fc9d30b2b8a17664dc2d879 ninja: Upgrade from 1.7.2 to major release 1.8.2<br>
385944254d0ef88bd6450a221a54cbcb40020b42 tcmode-default.inc: drop preferred version of gzip-native<o:p></o:p></p>
<p><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On 02/02/2018 12:58 PM, Burton, Ross wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<div>
<p class="MsoNormal">On 2 February 2018 at 19:06, Alejandro Enedino Hernandez Samaniego <<a href="mailto:alejandr@xilinx.com" target="_blank">alejandr@xilinx.com</a>> wrote:<o:p></o:p></p>
<div>
<div>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<p class="MsoNormal">This makes no sense to me, I rebased to master just before sending it.<o:p></o:p></p>
</blockquote>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Are you sure that the master you're rebasing is the actual upstream master?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Applying: ninja: Upgrade from 1.7.2 to major release 1.8.2<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Using index info to reconstruct a base tree...<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">error: patch failed: meta/recipes-devtools/ninja/<a href="http://ninja_1.7.2.bb:1" target="_blank">ninja_1.7.2.bb:1</a><o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">error: meta/recipes-devtools/ninja/<a href="http://ninja_1.7.2.bb" target="_blank">ninja_1.7.2.bb</a>: patch does not apply<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">error: Did you hand edit your patch?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">It does not apply to blobs recorded in its index.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Patch failed at 0001 ninja: Upgrade from 1.7.2 to major release 1.8.2<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal"> <o:p></o:p></p>
</div>
</div>
</div>
</div>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</blockquote>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</div>
</blockquote>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</body>
</html>