[OE-core] [PATCH 2/2] kernel-yocto: merge duplicate kernel_configme task definitions

[Bruce Ashfield]

On Fri, Mar 27, 2015 at 11:21 AM, Ross Burton <ross.burton at intel.com> wrote:
> 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.

Agreed. Organically grown .. and not ideal in the existing layout :)

Acked-by: Bruce Ashfield <bruce.ashfield at windriver.com>


>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  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 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
> --
> 1.7.10.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"