summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-04-22 00:36:00 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-29 11:17:22 +0100
commit929cebfb9730a541e1c511151ca09a03d5287a5e (patch)
tree6f16d74a998fde83a3dbf49aab88eb70d8e27431 /meta
parent52493384aad6ed3dc25e36b0a34f5fd5489e00cc (diff)
downloadpoky-929cebfb9730a541e1c511151ca09a03d5287a5e.tar.gz
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. (From OE-Core rev: 4d5890b54cbdac01ee748759578b7b22ed8e61a2) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass1
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0330270d3f..50226f6d49 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -255,6 +255,7 @@ do_kernel_checkout[dirs] = "${S}"
255addtask kernel_checkout before do_kernel_metadata after do_unpack 255addtask kernel_checkout before do_kernel_metadata after do_unpack
256addtask kernel_metadata after do_validate_branches do_unpack before do_patch 256addtask kernel_metadata after do_validate_branches do_unpack before do_patch
257do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" 257do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot"
258do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot"
258 259
259do_kernel_configme[dirs] += "${S} ${B}" 260do_kernel_configme[dirs] += "${S} ${B}"
260do_kernel_configme() { 261do_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 03f8ce3cc2..5e65469a69 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
4 4
5DEPENDS = "git-native" 5DEPENDS = "git-native"
6 6
7SRCREV = "5deada879404820db146685729e89ba0887fc0ee" 7SRCREV = "bd7447cd6274d764a129dcdc246cdbfd8c47b991"
8PR = "r12" 8PR = "r12"
9PV = "0.2+git${SRCPV}" 9PV = "0.2+git${SRCPV}"
10 10