[bitbake-devel] bitbake: runqueue: Use multiconfig name to fetch unihash

Submitted by Joshua Watt on Jan. 7, 2019, 7:23 p.m. | Patch ID: 157616

Details

Message ID 20190107192352.20747-1-JPEWhacker@gmail.com
State New
Headers show

Commit Message

Joshua Watt Jan. 7, 2019, 7:23 p.m.
The unihash should be fetched using the task filename that includes the
multiconfig prefixes.

[YOCTO #13124]

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 bitbake/lib/bb/runqueue.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 00a14ebde06..0e6cc31f309 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1168,7 +1168,7 @@  class RunQueueData:
             procdep.append(fn_from_tid(dep) + "." + taskname_from_tid(dep))
         (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
         self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(taskfn, taskname, procdep, self.dataCaches[mc])
-        self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(fn + "." + taskname)
+        self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(taskfn + "." + taskname)
 
     def dump_data(self):
         """
@@ -1932,7 +1932,7 @@  class RunQueueExecuteTasks(RunQueueExecute):
         (mc, fn, taskname, taskfn) = split_tid_mcfn(task)
 
         old_unihash = self.rqdata.runtaskentries[task].unihash
-        new_unihash = bb.parse.siggen.get_unihash(fn + '.' + taskname)
+        new_unihash = bb.parse.siggen.get_unihash(taskfn + '.' + taskname)
 
         unihash_changed = old_unihash != new_unihash
         if unihash_changed: