<div style="line-height:1.7;color:#000000;font-size:14px;font-family:Arial"><div>devtool modify u-boot<!--5f39ae17-8c62-4a45-bc43-b32064c9388a:W3siYmxvY2tJZCI6IjYxMjktMTU2MDQ3OTc3MTM0NCIsImJsb2NrVHlwZSI6ImNvZGUiLCJzdHlsZXMiOnsiYmFjay1jb2xvciI6IiJ9LCJ0eXBlIjoiY29kZSIsInJpY2hUZXh0Ijp7ImRhdGEiOlt7ImNoYXIiOiJkIn0seyJjaGFyIjoiZSJ9LHsiY2hhciI6InYifSx7ImNoYXIiOiJ0In0seyJjaGFyIjoibyJ9LHsiY2hhciI6Im8ifSx7ImNoYXIiOiJsIn0seyJjaGFyIjoiICJ9LHsiY2hhciI6Im0ifSx7ImNoYXIiOiJvIn0seyJjaGFyIjoiZCJ9LHsiY2hhciI6ImkifSx7ImNoYXIiOiJmIn0seyJjaGFyIjoieSJ9LHsiY2hhciI6IiAifSx7ImNoYXIiOiJ1In0seyJjaGFyIjoiLSJ9LHsiY2hhciI6ImIifSx7ImNoYXIiOiJvIn0seyJjaGFyIjoibyJ9LHsiY2hhciI6InQifV0sImlzUmljaFRleHQiOnRydWUsImtlZXBMaW5lQnJlYWsiOnRydWV9LCJpc1NlbGVjdGVkQmxvY2siOmZhbHNlLCJ0aGVtZSI6IkF0ZWxpZXJzdWxwaHVycG9vbCIsImxhbmd1YWdlIjoiamF2YXNjcmlwdCJ9XQ==--></div><div><br></div><div><br></div><div><br></div><div><br></div><div style="position:relative;zoom:1"></div><div id="divNeteaseMailCard"></div><div><br></div><p>ÔÚ 2020-03-08 17:19:56£¬"zhang_cy1989" <zhang_cy1989@163.com> Ð´µÀ£º</p><blockquote id="isReplyContent" style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid"><div style="line-height:1.7;color:#000000;font-size:14px;font-family:Arial"><div>Dear All</div><div>    Help me, Please!</div><div>   Thank you!</div><div><br></div><div>Felix<br></div><div><br></div><div><br></div><div><br></div><div><br></div><div style="position:relative;zoom:1"></div><div></div><div><br></div><p>At 2020-03-08 17:16:53, "zhang_cy1989" <zhang_cy1989@163.com> wrote:</p><blockquote id="isReplyContent" style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid"><div style="line-height:1.7;color:#000000;font-size:14px;font-family:Arial"><div>Dear All</div><div>    After I bitbake recipes with TEMPLATECONF=meta-openbmc-mods/meta-wolfpass/conf,</div><div>    I want to modify u-boot-aspeed with devtool.</div><div>    However,I got the following tips:</div><div>    devtool modify u-boot-aspeed</div><div>    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></div><div><b><br></b></div><div><b><br></b></div></div><br><br><span title="neteasefooter"><p> </p></span></blockquote></div><br><br><span title="neteasefooter"><p> </p></span></blockquote></div><br><br><span title="neteasefooter"><p> </p></span>