diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-03-27 15:21:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-29 23:07:16 +0100 |
| commit | b9646b9d31c3e0c70337a8c10ebfc087a0e2b829 (patch) | |
| tree | 01eaed01ae14a3135a69a4cc8a1cfb9403e6c045 | |
| parent | 4a0371847ff0c30d9b60db63559d89dddfcb009f (diff) | |
| download | openembedded-core-b9646b9d31c3e0c70337a8c10ebfc087a0e2b829.tar.gz openembedded-core-b9646b9d31c3e0c70337a8c10ebfc087a0e2b829.tar.bz2 openembedded-core-b9646b9d31c3e0c70337a8c10ebfc087a0e2b829.zip | |
kernel-yocto: merge duplicate kernel_configme task definitions
The kernel_configme task was added twice (once in the .bbclass, one in a .inc)
with different ordering constraints.
Change this to be just one definition in the bbclass with the stronger ordering
constraints.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a1fbb51e68..650ae5a473 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -289,7 +289,7 @@ do_kernel_configme() { echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config } -addtask kernel_configme after do_patch +addtask kernel_configme before do_configure after do_patch python do_kernel_configcheck() { import re, string, sys diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 5b69a49ab8..3b41a61c36 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" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" -addtask kernel_configme before do_configure after do_patch - # Pick up shared functions inherit kernel inherit kernel-yocto |