summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-05-08 23:42:24 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-09 21:01:51 +0100
commit8880407c5e5c731d22bcf521def131861ccc9f81 (patch)
tree3e30e8ad83d9d486a22d3101c88220817f09b33d
parentd36a73f7c46932c89f31cb2bf99ec743503b3139 (diff)
downloadpoky-8880407c5e5c731d22bcf521def131861ccc9f81.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. (From OE-Core rev: bd794b92d12ceda2728520701e980b7a3cabd23d) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
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
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7SRCREV = "9bb704df0a86578b8ae1f4c85e45089bef28e026" 7SRCREV = "de3649840e8e3ca25bc79d2444f04a1b158a1769"
8PR = "r12" 8PR = "r12"
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10