[yocto] [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches

[Bruce Ashfield]

On Wed, Jan 25, 2017 at 1:05 PM, Bruce Ashfield <bruce.ashfield at gmail.com>
wrote:

>
>
> On Wed, Jan 25, 2017 at 5:37 AM, David Vincent <freesilicon at gmail.com>
> wrote:
>
>> I've recently noticed that, on Morty, feature branches of a Yocto kernel
>> are not
>> merged anymore. This is due to the fact that the meta-series file does not
>> process the git merge commands anymore.
>>
>
> Indeed. I dropped that functionality on purpose when I did the
> simplification
> and streamlining of the processing .. since I wanted to see if anyone was
> using it.
>
> I now have my answer :D
>
> I need to have a closer look at the patch and run it through some tests
> here, but  on my glance, you've done it correctly.
>
>
>> This commit creates a new merge command to be executed when processing the
>> kernel metadata. To solve the issue, there is also a patch to send to
>> oe-core
>> for kernel-yocto.bbclass, but I wait for this patch to be included since
>> there
>> is no point without it.
>>
>
> Send that patch to me, or I'll just do the patch myself .. since yes, we
> do need
> to add merge to the list of valid comments when processing the meta data.
>
> I'll submit all the changes in my next consolidated pull request for the
> kernels + tools.
>

I spent Friday looking into this in more detail, and to keep things
consistent
with how the path and config queues are handled, with all the tree
manipulations
pull out of the various scripts and exposed in the bbclass itself, I ended
up with
a different implementation of the support.

The kern-tools change is the same as you did (and is your change), the
difference
is in the bbclass processing, where do_patch() modifies the tree, and it
consumes
the output of the meta-data routine .. versus the kgit-meta script itself.

The work can be seen in my poky-contrib tree:

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=zedd/kernel,
in the
commit "kern-tools: re-enable scc merge command".

These changes are on master, and passed my testing to merge feature branches
into the branch being built.

If you are able to try it out (on master), that would be great. I'm going
to let it
soak for a few days, and once it merges to master, it can be ported to
morty.

Cheers,

Bruce



>
> Bruce
>
>
>>
>> David Vincent (1):
>>   scc: Move merge command
>>
>>  tools/kgit-meta          | 14 ++++++++++++++
>>  tools/scc                | 13 -------------
>>  tools/scc-cmds/merge.cmd | 10 ++++++++++
>>  3 files changed, 24 insertions(+), 13 deletions(-)
>>  create mode 100644 tools/scc-cmds/merge.cmd
>>
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee
> at its end"
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20170129/3c025f7b/attachment.html>