Re: [PATCH 1/3] linux: copy-defconfig: move create_srcipk task after configure

[Denys Dmytriyenko <denys@ti.com>]

Didn't I already submit this last week when Sam reported it?


On Mon, Aug 08, 2016 at 09:39:28AM -0400, Jacob Stiffler wrote:
> * With sstate support for the sourceipk class, create_srcipk can no
>   longer be successfully called within another task.
> * Move the create_srcipk task after configure so that the build
>   defconfig is included in the src package.
> 
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>  meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc          | 7 +++++--
>  .../recipes-kernel/linux/linux-ti-staging-rt_%.bbappend            | 2 +-
>  .../recipes-kernel/linux/linux-ti-staging-systest_%.bbappend       | 2 +-
>  meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend | 2 +-
>  4 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc b/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
> index b9db1ee..46de4a3 100644
> --- a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
> +++ b/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
> @@ -5,7 +5,10 @@ CONFIG_NAME ?= "tisdk_${MACHINE}_defconfig"
>  # the function to build the sourceipk again.  This is done as a
>  # do_compile_prepend so that we can pick up any changes to the
>  # defconfig thay may have been done by the sanitizer code.
> -do_compile_prepend() {
> +do_configure_append() {
>      cp ${B}/.config ${S}/arch/arm/configs/${CONFIG_NAME}
> -    sourceipk_do_create_srcipk
>  }
> +
> +# Move create_srcipk task so that the release defconfig is included.
> +deltask do_create_srcipk
> +addtask create_srcipk after do_configure before do_compile
> diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
> index 7c90ac5..a3241ab 100644
> --- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
> +++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
> @@ -1,4 +1,4 @@
> -MACHINE_KERNEL_PR_append = ".arago0"
> +MACHINE_KERNEL_PR_append = ".arago1"
>  
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
>  
> diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
> index 7c90ac5..a3241ab 100644
> --- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
> +++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
> @@ -1,4 +1,4 @@
> -MACHINE_KERNEL_PR_append = ".arago0"
> +MACHINE_KERNEL_PR_append = ".arago1"
>  
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
>  
> diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
> index 4c50655..6ae4bd7 100644
> --- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
> +++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
> @@ -1,4 +1,4 @@
> -MACHINE_KERNEL_PR_append = ".arago4"
> +MACHINE_KERNEL_PR_append = ".arago5"
>  
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
>  
> -- 
> 2.7.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago