[OE-core] [PATCH 1/1] kern-tools: checkpoint restoration for reset branches
Bruce Ashfield
bruce.ashfield at windriver.com
Wed May 9 03:48:44 UTC 2012
Updating the SRCREV to pickup the following fix:
createme: fix checkpoint restoration for reset branches
The meta branch can optionally be merged out to BSP branches. This removes
the need to restore the checkpoint when working with the tree. The way
it detects the merge is by checking to see how many branches contain the
meta data. If there's more than one, the branch was was merged out.
Unless you are a BSP that isn't tracking the latest meta, and you get
meta and meta-orig created. That's two branches and the code opts to not
restore the checkpoint, which leads to configuration errors.
The fix is simple. We allow for 2 or less branches with meta, and will
still restore the checkpoint. Three and up, we won't.
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}"
--
1.7.0.4
More information about the Openembedded-core
mailing list