devtool modify u-boot-aspeed fail when using intel wolfpass recipe

[zhang_cy1989]

Dear All
    After I bitbake recipes with TEMPLATECONF=meta-openbmc-mods/meta-wolfpass/conf,
    I want to modify u-boot-aspeed with devtool.
    However,I got the following tips:
    devtool modify u-boot-aspeed
    ERROR: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:devtool_post_patch(d)
     0003:
File: '/intel-openbmc/openbmc/meta/classes/devtool-source.bbclass', lineno: 207, function: devtool_post_patch
     0203:            rm_patches()
     0204:            # Now we need to reconcile the dev branch with the no-overrides one
     0205:            # (otherwise we'd likely be left with identical commits that have different hashes)
     0206:            bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir)
 *** 0207:            bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir)
     0208:        else:
     0209:            bb.process.run('git checkout %s -b devtool-no-overrides' % devbranch, cwd=srcsubdir)
     0210:
     0211:        for override in extra_overrides:
File: '/intel-openbmc/openbmc/poky/bitbake/lib/bb/process.py', lineno: 182, function: run
     0178:        if not stderr is None:
     0179:            stderr = stderr.decode("utf-8")
     0180:
     0181:    if pipe.returncode != 0:
 *** 0182:        raise ExecutionError(cmd, pipe.returncode, stdout, stderr)
     0183:    return stdout, stderr
Exception: bb.process.ExecutionError: Execution of 'git rebase devtool-no-overrides' failed with exit code 1:
It looks like 'git am' is in progress. Cannot rebase.


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



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/openbmc/attachments/20200308/b048b31c/attachment.htm>