MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bitbake/lib/bb/build.py
View File

@ -932,9 +932,13 @@ def add_tasks(tasklist, d):
# don't assume holding a reference # don't assume holding a reference
d.setVar('_task_deps', task_deps) 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): def addtask(task, before, after, d):
if task[:3] != "do_": task = ensure_task_prefix(task)
task = "do_" + task
d.setVarFlag(task, "task", 1) d.setVarFlag(task, "task", 1)
bbtasks = d.getVar('__BBTASKS', False) or [] bbtasks = d.getVar('__BBTASKS', False) or []
@ -946,19 +950,20 @@ def addtask(task, before, after, d):
if after is not None: if after is not None:
# set up deps for function # set up deps for function
for entry in after.split(): for entry in after.split():
entry = ensure_task_prefix(entry)
if entry not in existing: if entry not in existing:
existing.append(entry) existing.append(entry)
d.setVarFlag(task, "deps", existing) d.setVarFlag(task, "deps", existing)
if before is not None: if before is not None:
# set up things that depend on this func # set up things that depend on this func
for entry in before.split(): for entry in before.split():
entry = ensure_task_prefix(entry)
existing = d.getVarFlag(entry, "deps", False) or [] existing = d.getVarFlag(entry, "deps", False) or []
if task not in existing: if task not in existing:
d.setVarFlag(entry, "deps", [task] + existing) d.setVarFlag(entry, "deps", [task] + existing)
def deltask(task, d): def deltask(task, d):
if task[:3] != "do_": task = ensure_task_prefix(task)
task = "do_" + task
bbtasks = d.getVar('__BBTASKS', False) or [] bbtasks = d.getVar('__BBTASKS', False) or []
if task in bbtasks: if task in bbtasks:

6
bitbake/lib/bb/tests/parse.py
View File

@ -188,6 +188,9 @@ addtask do_mytask3
deltask do_mytask3# comment deltask do_mytask3# comment
deltask do_mytask4 # comment2 deltask do_mytask4 # comment2
# Ensure a missing task prefix on after works
addtask do_mytask5 after mytask
MYVAR = "do_patch" MYVAR = "do_patch"
EMPTYVAR = "" EMPTYVAR = ""
deltask do_fetch ${MYVAR} ${EMPTYVAR} deltask do_fetch ${MYVAR} ${EMPTYVAR}
@ -198,7 +201,8 @@ deltask ${EMPTYVAR}
f = self.parsehelper(self.addtask_deltask) f = self.parsehelper(self.addtask_deltask)
d = bb.parse.handle(f.name, self.d)[''] d = bb.parse.handle(f.name, self.d)['']
self.assertEqual(['do_fetch2', 'do_patch2', 'do_myplaintask', 'do_mytask', 'do_mytask2'], d.getVar("__BBTASKS")) self.assertEqual(['do_fetch2', 'do_patch2', 'do_myplaintask', 'do_mytask', 'do_mytask2', 'do_mytask5'], d.getVar("__BBTASKS"))
self.assertEqual(['do_mytask'], d.getVarFlag("do_mytask5", "deps"))
broken_multiline_comment = """ broken_multiline_comment = """
# First line of comment \\ # First line of comment \\