kern-tools: re-enable scc merge command

The ability to merge two branches directly from a .scc file was
dropped during the streamlining of the tools.

As was pointed out by David Vincent <freesilicon@gmail.com>, there is
once again a valid use case for this functionality, so we restore the
capability.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5cfd8aff500738077382212d726ff360ce76622c..36f61c5694fb9552c2650b7d8dcb83c09860d385 100644 (file)
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -148,7 +148,7 @@ do_kernel_metadata() {
        # run1: pull all the configuration fragments, no matter where they come from
        elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
        if [ -n "${elements}" ]; then
-               scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
+               scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
                if [ $? -ne 0 ]; then
                        bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
                fi
@@ -165,6 +165,7 @@ do_kernel_metadata() {
 }
 
 do_patch() {
+       set +e
        cd ${S}
 
        check_git_config
@@ -177,6 +178,19 @@ do_patch() {
                        bbfatal_log "Patch failures can be resolved in the linux source directory ${S})"
                fi
        fi
+
+       if [ -f "${meta_dir}/merge.queue" ]; then
+               # we need to merge all these branches
+               for b in $(cat ${meta_dir}/merge.queue); do
+                       git show-ref --verify --quiet refs/heads/${b}
+                       if [ $? -eq 0 ]; then
+                               bbnote "Merging branch ${b}"
+                               git merge -q --no-ff -m "Merge branch ${b}" ${b}
+                       else
+                               bbfatal "branch ${b} does not exist, cannot merge"
+                       fi
+               done
+       fi
 }
 
 do_kernel_checkout() {

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 9e3e968a46aa9b672ee25632cf5b533fb6991dd9..4b1de5752c93fa7b421bb1a05aeab5ae18bc26d4 100644 (file)
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=a6c2fa8aef1b
 
 DEPENDS = "git-native"
 
-SRCREV = "bf2942f7559d114e96f7c7f1287bf7e5120632a3"
+SRCREV = "c14440d4e7ae0160c260ed65c3e123be5dc97ae8"
 PR = "r12"
 PV = "0.2+git${SRCPV}"