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.
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. 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@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
