summaryrefslogtreecommitdiff
path: root/meta/classes/kernel-yocto.bbclass
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2017-02-14 16:14:15 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-19 06:16:50 -0800
commitd57aeafdd2b49010a9fa6d1cd9d10f3cfd5754a5 (patch)
tree5bf394e05d899987142ad63b8eebb420faee8c17 /meta/classes/kernel-yocto.bbclass
parent9f225ef5620f2e47e762b2fd16fa5f8d6f1f60fd (diff)
downloadopenembedded-core-d57aeafdd2b49010a9fa6d1cd9d10f3cfd5754a5.tar.gz
openembedded-core-d57aeafdd2b49010a9fa6d1cd9d10f3cfd5754a5.tar.bz2
openembedded-core-d57aeafdd2b49010a9fa6d1cd9d10f3cfd5754a5.zip
kernel-yocto.bbclass: ensure repatching when HEAD is checked out
In some cases it is seen that kernel_checkout and validate_branches are run again in simultaneous builds. During do_patch the kgit-s2q mechanism looks for a sentinel file inside the .git directory, finds a fence post and starts picking up patches after that. This can create trouble as validate_branches checks out the HEAD of the branch and so the patches should be reapplied rather than skipped due to finding of the fence post. We can call kgit-s2q --clean to remove the sentinel file when the branches are checked out. Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-yocto.bbclass')
-rw-r--r--meta/classes/kernel-yocto.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index a7b6356381..33361b9624 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -365,6 +365,10 @@ do_validate_branches() {
current_branch=`git rev-parse --abbrev-ref HEAD`
git branch "$current_branch-orig"
git reset --hard ${force_srcrev}
+ # We've checked out HEAD, make sure we cleanup kgit-s2q fence post check
+ # so the patches are applied as expected otherwise no patching
+ # would be done in some corner cases.
+ kgit-s2q --clean
fi
fi
}