summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-11-03 16:16:10 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:33:23 +0000
commitd4fd7e2aa1ee1192e17d494faa52f4d52d041544 (patch)
treec0c9bf2a0ac315fcbb70bb034d50ecec25acccf2 /meta/lib/oe
parent397abe3acd12f1ef67c0a5d82d42fc858eb8864f (diff)
downloadpoky-d4fd7e2aa1ee1192e17d494faa52f4d52d041544.tar.gz
lib/oe/sstatesig: fix wildcard matching wrong task signature files
With a '*' as a wildcard for the signature here we can also match a portion of the task name with the result that we may match a sigdata file for the wrong task. Luckily the signature is always the same length - 32 characters - so we can simply use 32 '?' characters instead. (A regex would have been another alternative, but the wildcard should be effective and I felt like a regex would complicate the code more than this solution). Fixes [YOCTO #11763]. (From OE-Core rev: 73c6f85457361cd82d44838946aa81ba9bd1662a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/sstatesig.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 5a4093266d..3a8778eae0 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -320,7 +320,7 @@ def find_siginfo(pn, taskname, taskhashlist, d):
320 320
321 if not taskhashlist or (len(filedates) < 2 and not foundall): 321 if not taskhashlist or (len(filedates) < 2 and not foundall):
322 # That didn't work, look in sstate-cache 322 # That didn't work, look in sstate-cache
323 hashes = taskhashlist or ['*'] 323 hashes = taskhashlist or ['?' * 32]
324 localdata = bb.data.createCopy(d) 324 localdata = bb.data.createCopy(d)
325 for hashval in hashes: 325 for hashval in hashes:
326 localdata.setVar('PACKAGE_ARCH', '*') 326 localdata.setVar('PACKAGE_ARCH', '*')