[oe-commits] [openembedded-core] 01/22: kernel-yocto/kern-tools: fix do_validate_branches clean stage

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 4d5890b54cbdac01ee748759578b7b22ed8e61a2
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
AuthorDate: Sat Apr 22 00:36:00 2017 -0400

    kernel-yocto/kern-tools: fix do_validate_branches clean stage
    
    It was reported that do_validate_branches was failing with the following
    error:
    
      Log data follows:
      | DEBUG: Executing shell function do_validate_branches
      | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base
      | mkdir: cannot create directory .: File exists
      |
      | [ERROR] Can't find patch dir at ./patches/standard/base
      | usage: kgit s2q
      | WARNING: exit code 1 from a shell command.
      | ERROR: Function failed: do_validate_branches
    
    This was triggered by the execution of 'kgit-s2q --clean' after forcing
    the SRCREV to something other than the tip of the branch. --clean is
    being run to remove any sentinel files from previous kernel builds to
    ensure that the tree is in a consistent state.
    
    There were two bugs, --clean was being executed and not exiting the
    script as it was supposed to. Hence validation for applying patches
    was done, and threw the error that eventually makes it to the console.
    
    And the second bug is that since do_validate_branches actually calls
    kgit-s2q --clean, the dependency on kern-tools-native needs to be on
    that function (versus do_kernel_metadata which runs later).
    
    With the tweaked kern-tool + the dependency fix, we no longer see this
    error.
    
    Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel-yocto.bbclass                       | 1 +
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0330270..50226f6 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -255,6 +255,7 @@ do_kernel_checkout[dirs] = "${S}"
 addtask kernel_checkout before do_kernel_metadata after do_unpack
 addtask kernel_metadata after do_validate_branches do_unpack before do_patch
 do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot"
+do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot"
 
 do_kernel_configme[dirs] += "${S} ${B}"
 do_kernel_configme() {
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 03f8ce3..5e65469 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 = "5deada879404820db146685729e89ba0887fc0ee"
+SRCREV = "bd7447cd6274d764a129dcdc246cdbfd8c47b991"
 PR = "r12"
 PV = "0.2+git${SRCPV}"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.