diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-05-08 23:42:24 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-09 20:40:51 +0100 |
| commit | bd794b92d12ceda2728520701e980b7a3cabd23d (patch) | |
| tree | 962167b153ebde256d1e7b1a0cbe774f263cad93 /meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | |
| parent | 87249372b4a9951f9e4dc6acece950718382a164 (diff) | |
| download | openembedded-core-contrib-bd794b92d12ceda2728520701e980b7a3cabd23d.tar.gz | |
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@windriver.com>
Diffstat (limited to 'meta/recipes-kernel/kern-tools/kern-tools-native_git.bb')
| -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 b6fab399c1..b5e203e111 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}" |