mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

kern-tools: re-enable scc merge command

Browse Source 
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.

(From OE-Core rev: a0059ebbb52c659282e355664bba1a2fa282170e)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2017-02-01 10:30:29 -05:00
committed by Richard Purdie
parent 69083a1a1e
commit 80a74318de
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/kernel-yocto.bbclass
+15 -1
View File
@@ -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() {