[oe-commits] Bruce Ashfield : kern-tools: fix do_patch errors

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: bd794b92d12ceda2728520701e980b7a3cabd23d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bd794b92d12ceda2728520701e980b7a3cabd23d

Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date:   Tue May  8 23:42:24 2012 -0400

kern-tools: fix do_patch errors

The linux-yocto repository and scripts can support a mode of
meta data management that merges a base meta branch to every
BSP branch. In this case, the scripts don't have to restore
a checkpoint for the meta data to be globally accessible.

The decision to restore or not is made based on whether or
not the meta branch is part of all branches or not.

The linux-yocto recipes have a sanity check to determine if
the requested SRCREV for meta data matches the head of the
meta branch (via do_validate_branches). If the wrong commit
is at the head, the meta branch is moved aside and the branch
reset to the right commit. This creates two meta branches that
contain the base meta data.

The test for integrated meta data mistakes this for a globally
merged set of meta data and doesn't restore the checkpoint, which
leads to build failures.

The immediate fix is to allow two branches to have the meta
data. The long term fix is to make the detection only consider
if the build branch contains the meta data.

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>

---

 .../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 b6fab39..b5e203e 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=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "9bb704df0a86578b8ae1f4c85e45089bef28e026"
+SRCREV = "de3649840e8e3ca25bc79d2444f04a1b158a1769"
 PR = "r12"
 PV = "0.1+git${SRCPV}"