mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +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/recipes-kernel/kern-tools/kern-tools-native_git.bb
+1 -1
View File
@@ -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}"