MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake: runqueue: Fix handling of virtual files in layername calculation

Browse Source 
I'd tested target configurations but in real world use, it became clear
the layername functionality in worker context was failing for virtual
class extensions. Fix this.

(Bitbake rev: 888778ebfa85677ff36065dfcd0f8a7684edfc80)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2023-06-20 12:33:04 +01:00
parent 3ba736c6cd
commit 6f8dd36ca0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/bb/runqueue.py
View File

@ -2158,6 +2158,7 @@ class RunQueueExecute:
bb.event.fire(startevent, self.cfgData)
taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
realfn = bb.cache.virtualfn2realfn(taskfn)[0]
runtask = {
'fn' : taskfn,
'task' : task,
@ -2166,7 +2167,7 @@ class RunQueueExecute:
'unihash' : self.rqdata.get_task_unihash(task),
'quieterrors' : True,
'appends' : self.cooker.collections[mc].get_file_appends(taskfn),
'layername' : self.cooker.collections[mc].calc_bbfile_priority(taskfn)[2],
'layername' : self.cooker.collections[mc].calc_bbfile_priority(realfn)[2],
'taskdepdata' : self.sq_build_taskdepdata(task),
'dry_run' : False,
'taskdep': taskdep,
@ -2252,6 +2253,7 @@ class RunQueueExecute:
bb.event.fire(startevent, self.cfgData)
taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
realfn = bb.cache.virtualfn2realfn(taskfn)[0]
runtask = {
'fn' : taskfn,
'task' : task,
@ -2260,7 +2262,7 @@ class RunQueueExecute:
'unihash' : self.rqdata.get_task_unihash(task),
'quieterrors' : False,
'appends' : self.cooker.collections[mc].get_file_appends(taskfn),
'layername' : self.cooker.collections[mc].calc_bbfile_priority(taskfn)[2],
'layername' : self.cooker.collections[mc].calc_bbfile_priority(realfn)[2],
'taskdepdata' : self.build_taskdepdata(task),
'dry_run' : self.rqdata.setscene_enforce,
'taskdep': taskdep,