<div dir="ltr">This should have had [morty] in the subject. Sorry about that.<div><br></div><div>The explanation of the change is in the patch itself in the temporary area.</div><div><br></div><div>Cheers,</div><div><br></div><div>Bruce</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 7, 2017 at 11:20 PM, Bruce Ashfield <span dir="ltr"><<a href="mailto:bruce.ashfield@windriver.com" target="_blank">bruce.ashfield@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The ability to merge two branches directly from a .scc file was<br>
dropped during the streamlining of the tools.<br>
<br>
As was pointed out by David Vincent <<a href="mailto:freesilicon@gmail.com">freesilicon@gmail.com</a>>, there is<br>
once again a valid use case for this functionality, so we restore the<br>
capability.<br>
<br>
Signed-off-by: Bruce Ashfield <<a href="mailto:bruce.ashfield@windriver.com">bruce.ashfield@windriver.com</a>><br>
---<br>
<br>
Armin,<br>
<br>
This restores old functionality that was dropped due to kern-tools streamlining.<br>
It was reported as missing on morty, and this doesn't impact other functionality<br>
.. so it is worth restoring this, and of course, this also carries forward into<br>
master.<br>
<br>
Bruce<br>
<br>
meta/classes/kernel-yocto.<wbr>bbclass | 16 +++++++++++++++-<br>
meta/recipes-kernel/kern-<wbr>tools/<a href="http://kern-tools-native_git.bb" rel="noreferrer" target="_blank">kern-tools-native_git.bb</a> | 3 ++-<br>
2 files changed, 17 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/meta/classes/kernel-yocto.<wbr>bbclass b/meta/classes/kernel-yocto.<wbr>bbclass<br>
index a60327a..eb35dce 100644<br>
--- a/meta/classes/kernel-yocto.<wbr>bbclass<br>
+++ b/meta/classes/kernel-yocto.<wbr>bbclass<br>
@@ -148,7 +148,7 @@ do_kernel_metadata() {<br>
# run1: pull all the configuration fragments, no matter where they come from<br>
elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"<br>
if [ -n "${elements}" ]; then<br>
- scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}<br>
+ scc --force -o ${S}/${meta_dir}:cfg,merge,<wbr>meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}<br>
if [ $? -ne 0 ]; then<br>
bbfatal_log "Could not generate configuration queue for ${KMACHINE}."<br>
fi<br>
@@ -165,6 +165,7 @@ do_kernel_metadata() {<br>
}<br>
<br>
do_patch() {<br>
+ set +e<br>
cd ${S}<br>
<br>
check_git_config<br>
@@ -177,6 +178,19 @@ do_patch() {<br>
bbfatal_log "Patch failures can be resolved in the linux source directory ${S})"<br>
fi<br>
fi<br>
+<br>
+ if [ -f "${meta_dir}/merge.queue" ]; then<br>
+ # we need to merge all these branches<br>
+ for b in $(cat ${meta_dir}/merge.queue); do<br>
+ git show-ref --verify --quiet refs/heads/${b}<br>
+ if [ $? -eq 0 ]; then<br>
+ bbnote "Merging branch ${b}"<br>
+ git merge -q --no-ff -m "Merge branch ${b}" ${b}<br>
+ else<br>
+ bbfatal "branch ${b} does not exist, cannot merge"<br>
+ fi<br>
+ done<br>
+ fi<br>
}<br>
<br>
do_kernel_checkout() {<br>
diff --git a/meta/recipes-kernel/kern-<wbr>tools/<a href="http://kern-tools-native_git.bb" rel="noreferrer" target="_blank">kern-tools-native_git.bb</a> b/meta/recipes-kernel/kern-<wbr>tools/<a href="http://kern-tools-native_git.bb" rel="noreferrer" target="_blank">kern-tools-native_git.bb</a><br>
index 8af0155..aa27ec8 100644<br>
--- a/meta/recipes-kernel/kern-<wbr>tools/<a href="http://kern-tools-native_git.bb" rel="noreferrer" target="_blank">kern-tools-native_git.bb</a><br>
+++ b/meta/recipes-kernel/kern-<wbr>tools/<a href="http://kern-tools-native_git.bb" rel="noreferrer" target="_blank">kern-tools-native_git.bb</a><br>
@@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;<wbr>beginline=5;endline=9;md5=<wbr>a6c2fa8aef1b<br>
<br>
DEPENDS = "git-native"<br>
<br>
-SRCREV = "<wbr>85564e69555b713c2759d58ec5ade5<wbr>4424d051d8"<br>
+SRCREV = "<wbr>c14440d4e7ae0160c260ed65c3e123<wbr>be5dc97ae8"<br>
+<br>
PR = "r12"<br>
PV = "0.2+git${SRCPV}"<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.7.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <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>