summaryrefslogtreecommitdiffstats
path: root/meta/lib
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-12-04 17:23:56 +0000
commit87577b8a530a8affbbcc80c5d8afd6b123d950e0 (patch)
tree31d3326e78fb9415349cc73b8929f17de18358c5 /meta/lib
parent5599639b652d14fb8c216cc51a176f6a74cbc30b (diff)
downloadpoky-87577b8a530a8affbbcc80c5d8afd6b123d950e0.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: 8565391a4ebb574141b5d09bff710fc02c73ba34) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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', '*')