summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-11-29 18:42:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-13 15:21:44 (GMT)
commitdacedaa31edcbbdcbb69cb1305f9b13bda5847df (patch)
treecfe05084e5d03c2818a4e15fcb853964fd103560
parent70c3e69562c3ddc828ae28d6aff988c05a82dd54 (diff)
downloadpoky-dacedaa31edcbbdcbb69cb1305f9b13bda5847df.tar.gz
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 <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index f78d63b..528280e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -326,6 +326,8 @@ do_validate_branches() {
326 if [ $? -eq 0 ]; then 326 if [ $? -eq 0 ]; then
327 # restore the branch for builds 327 # restore the branch for builds
328 git checkout -q -f ${KBRANCH} 328 git checkout -q -f ${KBRANCH}
329 else
330 git checkout -q master
329 fi 331 fi
330} 332}
331 333