<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 25, 2017 at 5:37 AM, David Vincent <span dir="ltr"><<a href="mailto:freesilicon@gmail.com" target="_blank">freesilicon@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I've recently noticed that, on Morty, feature branches of a Yocto kernel are not<br>
merged anymore. This is due to the fact that the meta-series file does not<br>
process the git merge commands anymore.<br></blockquote><div><br></div><div>Indeed. I dropped that functionality on purpose when I did the simplification<br></div><div>and streamlining of the processing .. since I wanted to see if anyone was<br></div><div>using it.<br><br></div><div>I now have my answer :D<br></div><div> <br></div><div>I need to have a closer look at the patch and run it through some tests<br></div><div>here, but on my glance, you've done it correctly.<br></div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
This commit creates a new merge command to be executed when processing the<br>
kernel metadata. To solve the issue, there is also a patch to send to oe-core<br>
for kernel-yocto.bbclass, but I wait for this patch to be included since there<br>
is no point without it.<br></blockquote><div><br></div><div>Send that patch to me, or I'll just do the patch myself .. since yes, we do need<br></div><div>to add merge to the list of valid comments when processing the meta data.<br><br></div><div>I'll submit all the changes in my next consolidated pull request for the<br></div><div>kernels + tools.<br><br></div><div>Bruce<br></div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
David Vincent (1):<br>
 scc: Move merge command<br>
<br>
 tools/kgit-meta     | 14 ++++++++++++++<br>
 tools/scc        | 13 -------------<br>
 tools/scc-cmds/merge.cmd | 10 ++++++++++<br>
 3 files changed, 24 insertions(+), 13 deletions(-)<br>
 create mode 100644 tools/scc-cmds/merge.cmd<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.11.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
yocto mailing list<br>
<a href="mailto:yocto@yoctoproject.org">yocto@yoctoproject.org</a><br>
<a href="https://lists.yoctoproject.org/listinfo/yocto" rel="noreferrer" target="_blank">https://lists.yoctoproject.<wbr>org/listinfo/yocto</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"</div>
</div></div>