summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-03-27 15:21:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-31 22:23:13 +0100
commit6978d8aaa9c5c9498deeda6d3813e009e085ccf6 (patch)
treecc58695255032746b26ceba50e0c8803c05ea61a /meta
parenta9025e876d2d9b7252016cbe4d2086484a8d0480 (diff)
downloadpoky-6978d8aaa9c5c9498deeda6d3813e009e085ccf6.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: b9646b9d31c3e0c70337a8c10ebfc087a0e2b829) 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.bbclass2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc2
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() {
289 echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config 289 echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
290} 290}
291 291
292addtask kernel_configme after do_patch 292addtask kernel_configme before do_configure after do_patch
293 293
294python do_kernel_configcheck() { 294python do_kernel_configcheck() {
295 import re, string, sys 295 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"
32 32
33LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" 33LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
34 34
35addtask kernel_configme before do_configure after do_patch
36
37# Pick up shared functions 35# Pick up shared functions
38inherit kernel 36inherit kernel
39inherit kernel-yocto 37inherit kernel-yocto