[OE-core] [PATCH] kernel.bbclass: fix some incorrect inter-task dependencies

[Bruce Ashfield]

On Thu, Mar 30, 2017 at 3:58 AM, <liu.ming50 at gmail.com> wrote:

> From: Ming Liu <peter.x.liu at external.atlascopco.com>
>
> - Move the addtask statment that kernel_link_images needs run after
>   do_compile from linux-yocto.inc to kernel.bbclass. Or else the recipes
>   that inheriting kernel.bbclass might run into implicit dependency
>   issues.
> - Fix a typo, "addtask do_strip" should be "addtask strip".
> - Remove some redundant addtask statments, when "addtask A after B" is
>   set, then "addtask B before A" is not needed.
>

These should be multiple commits. Whenever you find yourself listing
changes in
a single commit header, it should really be multiple commits. Even if the
changes
are small.


>
> Signed-off-by: Ming Liu <peter.x.liu at external.atlascopco.com>
> ---
>  meta/classes/kernel.bbclass               | 5 +++--
>  meta/recipes-kernel/linux/linux-yocto.inc | 1 -
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 244087a..d175f1d 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -538,6 +538,7 @@ do_kernel_link_images() {
>                 ln -sf ../../../vmlinuz.bin
>         fi
>  }
> +addtask kernel_link_images after do_compile
>
>  do_strip() {
>         if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then
> @@ -566,7 +567,7 @@ do_strip() {
>  }
>  do_strip[dirs] = "${B}"
>
> -addtask do_strip before do_sizecheck after do_kernel_link_images
> +addtask strip before do_sizecheck after do_kernel_link_images
>
>  # Support checking the kernel size since some kernels need to reside in
> partitions
>  # with a fixed length or there is a limit in transferring the kernel to
> memory
> @@ -586,7 +587,7 @@ do_sizecheck() {
>  }
>  do_sizecheck[dirs] = "${B}"
>
> -addtask sizecheck before do_install after do_strip
> +addtask sizecheck before do_install
>

Although possibly redundant, I don't see the problem with leaving this in
place.
When we have the before and after here, it is self documenting when this
should
run.

With this removed, the reader must track down all the task dependencies
themselves
if they are to come to the same conclusion. Also, if that other task
dependency changes,
this will change.

So I prefer that this stay completely defined and self documenting.

Bruce


>
>  KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${
> MACHINE}-${DATETIME}"
>  # Don't include the DATETIME variable in the sstate package signatures
> diff --git a/meta/recipes-kernel/linux/linux-yocto.inc
> b/meta/recipes-kernel/linux/linux-yocto.inc
> index 556546f..637506a 100644
> --- a/meta/recipes-kernel/linux/linux-yocto.inc
> +++ b/meta/recipes-kernel/linux/linux-yocto.inc
> @@ -65,6 +65,5 @@ do_install_append(){
>
>  # extra tasks
>  addtask kernel_version_sanity_check after do_kernel_metadata
> do_kernel_checkout before do_compile
> -addtask kernel_link_images after do_compile before do_strip
>  addtask validate_branches before do_patch after do_kernel_checkout
>  addtask kernel_configcheck after do_configure before do_compile
> --
> 2.7.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"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170330/6c5fd72e/attachment-0002.html>