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-31 22:24:32 +0100 |
| commit | a842038bca3c3387261524b4b3e946f16f45f444 (patch) | |
| tree | e9dd0f935874d9bf461ad5aaa673dddfc2dd6510 /meta | |
| parent | 7c0846cc5bd15d83fda19a85b11e464c93a5f8b3 (diff) | |
| download | ast2050-yocto-poky-a842038bca3c3387261524b4b3e946f16f45f444.zip ast2050-yocto-poky-a842038bca3c3387261524b4b3e946f16f45f444.tar.gz | |
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.
(From OE-Core rev: 0830078cd1d6a365543877bf8eda93c3fff71b0d)
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 | 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 a1fbb51..650ae5a 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 5b69a49..3b41a61 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 |
