[PATCH] externalsrc: Remove task dependencies to deleted tasks

[PATCH] externalsrc: Remove task dependencies to deleted tasks

[Tomasz Dziendzielski]

The python3 recipe sets `do_create_manifest[depends] += "${PN}:do_patch"`
but do_patch is removed in externalsrc and fails with:
| ERROR: Task do_create_manifest in <PATH>/python3_3.8.2.bb depends upon
| non-existent task do_patch in <PATH>/python3_3.8.2.bb

It is safe to simply remove these dependencies since they should be
already covered.

[YOCTO #14151]

Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
---
 meta/classes/externalsrc.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 7a7d31e311..8e164707e6 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -107,6 +107,9 @@ python () {
         for task in d.getVar("SRCTREECOVEREDTASKS").split():
             if local_srcuri and task in fetch_tasks:
                 continue
+            for bbtask in (d.getVar('__BBTASKS', False) or []):
+                if 'depends' in (d.getVarFlags(bbtask, False) or []) and ('${PN}:%s' % task) in d.getVarFlags(bbtask, False)['depends']:
+                    d.setVarFlag(bbtask, 'depends', d.getVarFlags(bbtask, False)['depends'].replace(('${PN}:%s' % task), ''))
             bb.build.deltask(task, d)
 
         d.prependVarFlag('do_compile', 'prefuncs', "externalsrc_compile_prefunc ")
-- 
2.30.0

Re: [OE-core] [PATCH] externalsrc: Remove task dependencies to deleted tasks

[Richard Purdie]

On Mon, 2021-01-25 at 22:01 +0100, Tomasz Dziendzielski wrote:
> The python3 recipe sets `do_create_manifest[depends] += "${PN}:do_patch"`
> but do_patch is removed in externalsrc and fails with:
> > ERROR: Task do_create_manifest in <PATH>/python3_3.8.2.bb depends upon
> > non-existent task do_patch in <PATH>/python3_3.8.2.bb
> 
> It is safe to simply remove these dependencies since they should be
> already covered.
> 
> [YOCTO #14151]
> 
> Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
> ---
>  meta/classes/externalsrc.bbclass | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> index 7a7d31e311..8e164707e6 100644
> --- a/meta/classes/externalsrc.bbclass
> +++ b/meta/classes/externalsrc.bbclass
> @@ -107,6 +107,9 @@ python () {
>          for task in d.getVar("SRCTREECOVEREDTASKS").split():
>              if local_srcuri and task in fetch_tasks:
>                  continue
> +            for bbtask in (d.getVar('__BBTASKS', False) or []):
> +                if 'depends' in (d.getVarFlags(bbtask, False) or []) and ('${PN}:%s' % task) in d.getVarFlags(bbtask, False)['depends']:
> +                    d.setVarFlag(bbtask, 'depends', d.getVarFlags(bbtask, False)['depends'].replace(('${PN}:%s' % task), ''))
>              bb.build.deltask(task, d)

would it help to change the python recipe to do:

addtask do_create_manifest after do_patch do_prepare_recipe_sysroot

?

Cheers,

Richard

Re: [OE-core] [PATCH] externalsrc: Remove task dependencies to deleted tasks

[Tomasz Dziendzielski]

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

>would it help to change the python recipe to do:
>addtask do_create_manifest after do_patch do_prepare_recipe_sysroot
>?
Well I think it would, I just thought it's done that way for some reason.
I will submit a new patch.

Best regards,
Tomasz Dziendzielski

[-- Attachment #2: Type: text/html, Size: 417 bytes --]