diff options
author | Ross Burton <ross.burton@intel.com> | 2015-03-27 15:21:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-31 22:24:31 +0100 |
commit | 7c0846cc5bd15d83fda19a85b11e464c93a5f8b3 (patch) | |
tree | a773cf98d07b379ad48cfda537249e033f886a46 /meta | |
parent | 47686dc42f979f1f8d61f66fa9ef96a06ebf8b77 (diff) | |
download | poky-7c0846cc5bd15d83fda19a85b11e464c93a5f8b3.tar.gz |
linux-yocto: add kern-tools-native to kernel_metadata depends
The autobuilder failed like this:
temp/run.do_kernel_metadata.25242: line 165: createme: command not found
createme is provided by kern-tools-native. do_patch has a dependency on
kern-tools-native, but do_kernel_metadata runs before do_patch. So move the
dependency from do_patch to do_kernel_metadata, moving the statement from the
.inc to the class so it's alongside the task definition.
[ YOCTO #7531 ]
(From OE-Core rev: 938d0288adc2ace3c66dab5904ad958a4c7615cc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 1 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 14551a23f2..a1fbb51e68 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -261,6 +261,7 @@ do_kernel_checkout[dirs] = "${S}" | |||
261 | 261 | ||
262 | addtask kernel_checkout before do_patch after do_unpack | 262 | addtask kernel_checkout before do_patch after do_unpack |
263 | addtask kernel_metadata after do_validate_branches before do_patch | 263 | addtask kernel_metadata after do_validate_branches before do_patch |
264 | do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" | ||
264 | 265 | ||
265 | do_kernel_configme[dirs] += "${S} ${B}" | 266 | do_kernel_configme[dirs] += "${S} ${B}" |
266 | do_kernel_configme() { | 267 | do_kernel_configme() { |
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index c62f8ca97d..5b69a49ab8 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
@@ -32,8 +32,6 @@ KCONF_BSP_AUDIT_LEVEL ?= "0" | |||
32 | 32 | ||
33 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | 33 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" |
34 | 34 | ||
35 | do_patch[depends] = "kern-tools-native:do_populate_sysroot" | ||
36 | |||
37 | addtask kernel_configme before do_configure after do_patch | 35 | addtask kernel_configme before do_configure after do_patch |
38 | 36 | ||
39 | # Pick up shared functions | 37 | # Pick up shared functions |