[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4664/8267] kernel-yocto.bbclass: ensure repatching when HEAD is checked out

[Emmanuele Bassi <ebassi src gnome org>]

commit 35a79cc495413f2cebe08e566f68ffef116cd6a3
Author: Awais Belal <awais_belal mentor com>
Date:   Tue Feb 14 16:14:15 2017 -0500

    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.
    
    (From OE-Core rev: d57aeafdd2b49010a9fa6d1cd9d10f3cfd5754a5)
    
    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>

 meta/classes/kernel-yocto.bbclass                  |    4 ++++
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index a7b6356..33361b9 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
 }
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 4b1de57..03f8ce3 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=a6c2fa8aef1b
 
 DEPENDS = "git-native"
 
-SRCREV = "c14440d4e7ae0160c260ed65c3e123be5dc97ae8"
+SRCREV = "5deada879404820db146685729e89ba0887fc0ee"
 PR = "r12"
 PV = "0.2+git${SRCPV}"