<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)">
<!--[if !mso]><style>v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style><![endif]--><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:DengXian;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"Microsoft YaHei";
panose-1:2 11 5 3 2 2 4 2 2 4;}
@font-face
{font-family:"\@Microsoft YaHei";}
@font-face
{font-family:"\@DengXian";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-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.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
span.mail-date
{mso-style-name:mail-date;}
span.EmailStyle21
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@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:10.5pt;font-family:"Microsoft YaHei",sans-serif">devtool modify u-boot-aspeed-sdk</span><o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b>From:</b> openbmc <openbmc-bounces+zhikui.ren=intel.com@lists.ozlabs.org>
<b>On Behalf Of </b>zhang_cy1989<br>
<b>Sent:</b> Monday, March 9, 2020 4:38 PM<br>
<b>To:</b> <span lang="ZH-CN" style="font-family:"Microsoft YaHei",sans-serif">阿桂</span> <guilin1985@126.com><br>
<b>Cc:</b> openbmc@lists.ozlabs.org<br>
<b>Subject:</b> Re: devtool modify u-boot-aspeed fail when using intel wolfpass recipe<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif">Dear
<span lang="ZH-CN">阿桂 </span><o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif"> Whether "devtool modify u-boot-aspeed" or "devtool modify u-boot", I have still those errors mentioned in the previous email.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif"> Can you have another suggestion?<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif">Felix
<o:p></o:p></span></p>
</div>
<div id="ntes-pcmac-signature">
<div>
<div style="border:none;border-bottom:solid #E6E6E6 1.0pt;padding:0in 0in 5.0pt 0in;margin-bottom:7.5pt;display:inline-block">
<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100.0%;border-collapse:collapse">
<tbody>
<tr>
<td width="38" style="width:28.5pt;padding:0in 0in 0in 0in">
<p class="MsoNormal" style="word-break:break-all"><span style="font-size:10.5pt;color:#9B9EA1"><img width="38" height="38" style="width:.3958in;height:.3958in" id="_x0000_i1025" src="https://mail-online.nosdn.127.net/qiyelogo/defaultAvatar.png"><o:p></o:p></span></p>
</td>
<td style="padding:0in 0in 0in 7.5pt">
<div>
<p class="MsoNormal" style="word-break:break-all"><b><span style="font-size:12.0pt;color:#31353B">zhang_cy1989<o:p></o:p></span></b></p>
</div>
</td>
</tr>
<tr>
<td width="100%" colspan="2" style="width:100.0%;padding:7.5pt 0in 0in 0in">
<div>
<p class="MsoNormal" style="word-break:break-all"><span style="font-size:10.5pt;color:#9B9EA1"><a href="mailto:zhang_cy1989@163.com">zhang_cy1989@163.com</a><o:p></o:p></span></p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div>
<p class="MsoNormal" style="line-height:13.5pt"><span lang="ZH-CN" style="font-size:9.0pt;font-family:"Microsoft YaHei",sans-serif;color:#B5B9BD">签名由
</span><span style="font-size:9.0pt;font-family:"Microsoft YaHei",sans-serif;color:#B5B9BD"><a href="https://mail.163.com/dashi/dlpro.html?from=mail81"><span lang="ZH-CN" style="color:#4196FF;text-decoration:none">网易邮箱大师</span></a>
<span lang="ZH-CN">定制 </span><o:p></o:p></span></p>
</div>
</div>
</div>
<div style="margin-top:33.75pt;margin-bottom:15.0pt;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px">
<div style="margin-left:7.5pt;margin-right:7.5pt">
<p class="MsoNormal" style="background:#F2F2F2;word-break:break-all"><span style="font-size:9.0pt;font-family:"Microsoft YaHei",sans-serif;color:black">On
<span class="mail-date">3/9/2020 10:10</span><span lang="ZH-CN">，</span><a href="mailto:guilin1985@126.com"><span lang="ZH-CN" style="color:#2A83F2;text-decoration:none">阿桂</span><span style="color:#2A83F2;text-decoration:none"><guilin1985@126.com></span></a>
wrote<span lang="ZH-CN">： </span><o:p></o:p></span></p>
</div>
</div>
<blockquote id="ntes-pcmail-quote">
<div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black">devtool modify u-boot<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<p><span lang="ZH-CN" style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif;color:black">在</span><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> 2020-03-08 17:19:56</span><span lang="ZH-CN" style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif;color:black">，</span><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black">"zhang_cy1989"
<<a href="mailto:zhang_cy1989@163.com">zhang_cy1989@163.com</a>> </span><span lang="ZH-CN" style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif;color:black">写道：</span><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p></o:p></span></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in" id="isReplyContent">
<div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black">Dear All<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> Help me, Please!<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> Thank you!<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black">Felix<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<p><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black">At 2020-03-08 17:16:53, "zhang_cy1989" <<a href="mailto:zhang_cy1989@163.com">zhang_cy1989@163.com</a>> wrote:<o:p></o:p></span></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in" id="isReplyContent">
<div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black">Dear All<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> After I bitbake recipes with TEMPLATECONF=meta-openbmc-mods/meta-wolfpass/conf,<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> I want to modify u-boot-aspeed with devtool.<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> However,I got the following tips:<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> devtool modify u-boot-aspeed<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> ERROR: Error executing a python function in exec_python_func() autogenerated:<br>
<br>
<b>The stack trace of python calls that resulted in this exception/failure was:</b><br>
<b>File: 'exec_python_func() autogenerated', lineno: 2, function: <module></b><br>
<b> 0001:</b><br>
<b> *** 0002:devtool_post_patch(d)</b><br>
<b> 0003:</b><br>
<b>File: '/intel-openbmc/openbmc/meta/classes/devtool-source.bbclass', lineno: 207, function: devtool_post_patch</b><br>
<b> 0203: rm_patches()</b><br>
<b> 0204: # Now we need to reconcile the dev branch with the no-overrides one</b><br>
<b> 0205: # (otherwise we'd likely be left with identical commits that have different hashes)</b><br>
<b> 0206: bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir)</b><br>
<b> *** 0207: bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir)</b><br>
<b> 0208: else:</b><br>
<b> 0209: bb.process.run('git checkout %s -b devtool-no-overrides' % devbranch, cwd=srcsubdir)</b><br>
<b> 0210:</b><br>
<b> 0211: for override in extra_overrides:</b><br>
<b>File: '/intel-openbmc/openbmc/poky/bitbake/lib/bb/process.py', lineno: 182, function: run</b><br>
<b> 0178: if not stderr is None:</b><br>
<b> 0179: stderr = stderr.decode("utf-8")</b><br>
<b> 0180:</b><br>
<b> 0181: if pipe.returncode != 0:</b><br>
<b> *** 0182: raise ExecutionError(cmd, pipe.returncode, stdout, stderr)</b><br>
<b> 0183: return stdout, stderr</b><br>
<b>Exception: bb.process.ExecutionError: Execution of 'git rebase devtool-no-overrides' failed with exit code 1:</b><br>
<b>It looks like 'git am' is in progress. Cannot rebase.</b><br>
<br>
<br>
<b>ERROR: Logfile of failure stored in: /intel-openbmc/openbmc/build/tmp/work/intel_ast2500-openbmc-linux-gnueabi/u-boot-aspeed/1_v2016.07+gitAUTOINC+59428fe010-r0/devtooltmp-8q2im08o/temp/log.do_patch.9041</b><o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><o:p> </o:p></span></p>
</div>
</div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><br>
<br>
<br>
<o:p></o:p></span></p>
<p><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> <o:p></o:p></span></p>
</blockquote>
</div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"><br>
<br>
<br>
<o:p></o:p></span></p>
<p><span style="font-size:10.5pt;font-family:"Arial",sans-serif;color:black"> <o:p></o:p></span></p>
</blockquote>
</div>
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif"><br>
<br>
<br>
<o:p></o:p></span></p>
<p><span style="font-size:10.5pt;font-family:"Microsoft YaHei",sans-serif"> <o:p></o:p></span></p>
</blockquote>
</div>
</div>
</body>
</html>