mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: build: Ensure addtask before/after tasknames have prefix applied

Browse Source 
"addtask do_XXX before YYY after ZZZ "

where YYY or ZZZ is missing the "do_" prefix don't work as expected. Ajust the
code so that it doesn't just silently do the wrong thing but works as expected.

Expand a test case to cover this.

(Bitbake rev: 21670b9bb8936ec44aedff26163948bbc2ceb44a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2024-08-12 15:54:46 +01:00
parent 5226f46342
commit 997b11a5a1
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/build.py
+9 -4
View File
@@ -932,9 +932,13 @@ def add_tasks(tasklist, d):
# don't assume holding a reference
d.setVar('_task_deps', task_deps)
def ensure_task_prefix(name):
if name[:3] != "do_":
name = "do_" + name
return name
def addtask(task, before, after, d):
if task[:3] != "do_":
task = "do_" + task
task = ensure_task_prefix(task)
d.setVarFlag(task, "task", 1)
bbtasks = d.getVar('__BBTASKS', False) or []
@@ -946,19 +950,20 @@ def addtask(task, before, after, d):
if after is not None:
# set up deps for function
for entry in after.split():
entry = ensure_task_prefix(entry)
if entry not in existing:
existing.append(entry)
d.setVarFlag(task, "deps", existing)
if before is not None:
# set up things that depend on this func
for entry in before.split():
entry = ensure_task_prefix(entry)
existing = d.getVarFlag(entry, "deps", False) or []
if task not in existing:
d.setVarFlag(entry, "deps", [task] + existing)
def deltask(task, d):
if task[:3] != "do_":
task = "do_" + task
task = ensure_task_prefix(task)
bbtasks = d.getVar('__BBTASKS', False) or []
if task in bbtasks: