From dacedaa31edcbbdcbb69cb1305f9b13bda5847df Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 29 Nov 2012 13:42:22 -0500 Subject: kernel-yocto: checkout known branch before leaving do_validate_branches We should always leave the tree on a BSP branch or master when do_validate_branches completes to avoid modifying version tracked files are part of the build process. Modifying these files will lead to errors when changing branches, since the contents would be lost. This is evident in the case that a the meta branch is reset to a known SRCREV and the tree was left on the meta branch. This branch tracks the meta/meta-series, and other artifacts of the original tree construction. When the build process runs, it updates these same files, which creates a conflict when switching branches. This has been fixed in the tree construction scripts to not track these files, but a secondary fix is also required of not leaving the build on these branches, to allow arbitrary trees to be built. [YOCTO #3413] (From OE-Core rev: 36f4e23d037dae758cd42189f2ab00f22a1cd723) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f78d63b349..528280eafa 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -326,6 +326,8 @@ do_validate_branches() { if [ $? -eq 0 ]; then # restore the branch for builds git checkout -q -f ${KBRANCH} + else + git checkout -q master fi } -- cgit v1.2.3-54-g00ecf