From 0830078cd1d6a365543877bf8eda93c3fff71b0d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 27 Mar 2015 15:21:01 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- meta/recipes-kernel/linux/linux-yocto.inc | 2 -- 2 files changed, 1 insertion(+), 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 -- cgit 1.2.3-korg