diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-09-04 08:40:35 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-04 14:46:18 +0100 |
| commit | df2e432cd3431cfd2288f4d5fffe1d8476ffda16 (patch) | |
| tree | 1af65ece56d44991a3e5020e041f07a6080bee00 /meta/recipes-kernel/kern-tools | |
| parent | d7805cfac4a58971dbef6eb903149dd6099bcf69 (diff) | |
| download | poky-df2e432cd3431cfd2288f4d5fffe1d8476ffda16.tar.gz | |
kern-tools: fix non-inheriting branch names
Importing the following tools SRCREV:
kgit-meta: exclude explicit branches from name calculations
kernel branches are constructed during patching of the tree by
constructing a '/' based hierarchy of names as each branch
directive is encountered.
But if a "branch $name $branchpoint" is used, the entire branch
name is supplied so no additions to the hierarchy should
happen. As such, that type of branch command should not be part
of branch name calculation and preparation.
(From OE-Core rev: a3884938233c8a2d6861b1d4e6be5b9824d3b131)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kern-tools')
| -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 b560059f1d..e8926ee865 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=d8d1d729a70c | |||
| 4 | 4 | ||
| 5 | DEPENDS = "git-native guilt-native" | 5 | DEPENDS = "git-native guilt-native" |
| 6 | 6 | ||
| 7 | SRCREV = "6e92eca3bd30d73222dfeaae6d2d1d9764a5a3f8" | 7 | SRCREV = "0c7b625280eb9ff62d40b53308e7238ddd164f38" |
| 8 | PR = "r12" | 8 | PR = "r12" |
| 9 | PV = "0.1+git${SRCPV}" | 9 | PV = "0.1+git${SRCPV}" |
| 10 | 10 | ||