From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 11 Jul 2019 15:58:14 +0000 (+0100)
Subject: bitbake: siggen: Use unique hashes for tasks
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a2914fc981668bf01768bc3050329c1254a74d6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: siggen: Use unique hashes for tasks

Now that runqueue optimises based on task hash, we need to ensure
tasks have unique hashes even in the simplest siggen mode. Use
the task name to calculate a unique hash.

This fixes runqueue tests when hash optimisations are added.

(Bitbake rev: 8ede873ef4ef492fbaf01474685c1ca8b34d80d5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 3b017219ed1..f9c4798e3d7 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -49,8 +49,9 @@ class SignatureGenerator(object):
         return self.taskhash[task]
 
     def get_taskhash(self, fn, task, deps, dataCache):
-        self.taskhash[fn + "." + task] = "0"
-        return self.taskhash[fn + "." + task]
+        k = fn + "." + task
+        self.taskhash[k] = hashlib.sha256(k.encode("utf-8")).hexdigest()
+        return self.taskhash[k]
 
     def writeout_file_checksum_cache(self):
         """Write/update the file checksum cache onto disk"""