mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

ssate: Cleanup directtasks handling

Browse Source 
There are several tasks which should only be triggered by direct
dependencies. Some are listed in the dep loop, some are not. They
should all be in both cases.

Fix this by making a list and using the list in both cases to fix
various inconsistencies.

(From OE-Core rev: 29d285bc07bd7732c7ea39c0fd03c0b3c0d93e52)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-09-21 11:12:05 +01:00
parent fb69823486
commit 10e7310730
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/sstate.bbclass
+4 -14
View File
@@ -1059,19 +1059,13 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
logit("Considering setscene task: %s" % (str(taskdependees[task])), log)
directtasks = ["do_populate_lic", "do_deploy_source_date_epoch", "do_shared_workdir", "do_stash_locale", "do_gcc_stash_builddir"]
def isNativeCross(x):
return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x or x.endswith("-cross")
# We only need to trigger populate_lic through direct dependencies
if taskdependees[task][1] == "do_populate_lic":
return True
# We only need to trigger deploy_source_date_epoch through direct dependencies
if taskdependees[task][1] == "do_deploy_source_date_epoch":
return True
# stash_locale and gcc_stash_builddir are never needed as a dependency for built objects
if taskdependees[task][1] == "do_stash_locale" or taskdependees[task][1] == "do_gcc_stash_builddir":
if taskdependees[task][1] in directtasks:
return True
# We only need to trigger packagedata through direct dependencies
@@ -1143,13 +1137,9 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
# Target populate_sysroot need their dependencies
return False
if taskdependees[task][1] == 'do_shared_workdir':
if taskdependees[dep][1] in directtasks:
continue
if taskdependees[dep][1] == "do_populate_lic":
continue
# Safe fallthrough default
logit(" Default setscene dependency fall through due to dependency: %s" % (str(taskdependees[dep])), log)
return False