diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 22:49:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 23:52:59 +0100 |
commit | b8584fe5c68c004c5e53e5f0a559886adac386ae (patch) | |
tree | f1d71016668e08c542054579cb7eb820de12f8ad | |
parent | 790cc61a754d156c15f77c95539e17ec4d9f2c41 (diff) | |
download | poky-b8584fe5c68c004c5e53e5f0a559886adac386ae.tar.gz |
sstatesig: Anchor inherits class tests
There was a nasty sstate hash corruption issue occurring where the
fact the testimage bbclass was inherited meant that the checksum
changed due to testimage.bbclass being confused with image.bbclass.
This patch anchors the bbclass names to avoid this confusion.
(From OE-Core rev: 943a75a4f3b6877e4092dae14b59b7afef8cad3d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/sstatesig.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 8b0e344501..aa25c3a10e 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -10,12 +10,12 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache): | |||
10 | return x.startswith("nativesdk-") | 10 | return x.startswith("nativesdk-") |
11 | def isKernel(fn): | 11 | def isKernel(fn): |
12 | inherits = " ".join(dataCache.inherits[fn]) | 12 | inherits = " ".join(dataCache.inherits[fn]) |
13 | return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1 | 13 | return inherits.find("/module-base.bbclass") != -1 or inherits.find("/linux-kernel-base.bbclass") != -1 |
14 | def isPackageGroup(fn): | 14 | def isPackageGroup(fn): |
15 | inherits = " ".join(dataCache.inherits[fn]) | 15 | inherits = " ".join(dataCache.inherits[fn]) |
16 | return "packagegroup.bbclass" in inherits | 16 | return "/packagegroup.bbclass" in inherits |
17 | def isImage(fn): | 17 | def isImage(fn): |
18 | return "image.bbclass" in " ".join(dataCache.inherits[fn]) | 18 | return "/image.bbclass" in " ".join(dataCache.inherits[fn]) |
19 | 19 | ||
20 | # Always include our own inter-task dependencies | 20 | # Always include our own inter-task dependencies |
21 | if recipename == depname: | 21 | if recipename == depname: |