Openembedded Bitbake Development
 help / color / mirror / Atom feed
From: Joshua Watt <jpewhacker@gmail.com>
To: bitbake-devel@lists.openembedded.org
Cc: alejandro.enedino.hernandez-samaniego@xilinx.com
Subject: [PATCH] bitbake: runqueue: Use multiconfig name to fetch unihash
Date: Mon,  7 Jan 2019 13:23:52 -0600	[thread overview]
Message-ID: <20190107192352.20747-1-JPEWhacker@gmail.com> (raw)

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(-)

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:
-- 
2.20.1



                 reply	other threads:[~2019-01-07 19:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190107192352.20747-1-JPEWhacker@gmail.com \
    --to=jpewhacker@gmail.com \
    --cc=alejandro.enedino.hernandez-samaniego@xilinx.com \
    --cc=bitbake-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox