Patchwork [4/6] kern-tools: fix non-inheriting branch names

login
register
mail settings
Submitter Bruce Ashfield
Date Sept. 4, 2012, 12:40 p.m.
Message ID <1a95cec9412edeacb30a26966032fb71596cf728.1346762109.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/35797/
State Accepted
Commit a3884938233c8a2d6861b1d4e6be5b9824d3b131
Headers show

Comments

Bruce Ashfield - Sept. 4, 2012, 12:40 p.m.
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.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

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 b560059..e8926ee 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
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "6e92eca3bd30d73222dfeaae6d2d1d9764a5a3f8"
+SRCREV = "0c7b625280eb9ff62d40b53308e7238ddd164f38"
 PR = "r12"
 PV = "0.1+git${SRCPV}"