From df2e432cd3431cfd2288f4d5fffe1d8476ffda16 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 4 Sep 2012 08:40:35 -0400 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 DEPENDS = "git-native guilt-native" -SRCREV = "6e92eca3bd30d73222dfeaae6d2d1d9764a5a3f8" +SRCREV = "0c7b625280eb9ff62d40b53308e7238ddd164f38" PR = "r12" PV = "0.1+git${SRCPV}" -- cgit v1.2.3-54-g00ecf