summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-11-29 13:42:22 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 16:38:35 +0000
commite2e0942a35dc4a6d1346686a93c21260b092b307 (patch)
tree37dd0cc0bdd8cd2350356bcd7864a7dd6735a90e /meta/classes
parent5d8ddf43d22412dcaaee973b4556e9a969b6aae1 (diff)
downloadpoky-e2e0942a35dc4a6d1346686a93c21260b092b307.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: 57397592ff8ec16922604d398c18d53a589be41f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 0d4ed21e3a..c74317e9bd 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -327,6 +327,8 @@ do_validate_branches() {
327 if [ $? -eq 0 ]; then 327 if [ $? -eq 0 ]; then
328 # restore the branch for builds 328 # restore the branch for builds
329 git checkout -q -f ${KBRANCH} 329 git checkout -q -f ${KBRANCH}
330 else
331 git checkout -q master
330 fi 332 fi
331} 333}
332 334