diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-01 10:30:29 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-05 09:22:17 +0000 |
| commit | 80a74318de40be4648d0aa69e1e44db754e5be89 (patch) | |
| tree | 9e325ad76d29ba728eb998990d72f52c6788ee80 /meta/recipes-kernel | |
| parent | 69083a1a1e73333f34b047a73ef5228dcc3384bd (diff) | |
| download | poky-80a74318de40be4648d0aa69e1e44db754e5be89.tar.gz | |
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.
(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>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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 9e3e968a46..4b1de5752c 100644 --- 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 | |||
| 4 | 4 | ||
| 5 | DEPENDS = "git-native" | 5 | DEPENDS = "git-native" |
| 6 | 6 | ||
| 7 | SRCREV = "bf2942f7559d114e96f7c7f1287bf7e5120632a3" | 7 | SRCREV = "c14440d4e7ae0160c260ed65c3e123be5dc97ae8" |
| 8 | PR = "r12" | 8 | PR = "r12" |
| 9 | PV = "0.2+git${SRCPV}" | 9 | PV = "0.2+git${SRCPV}" |
| 10 | 10 | ||