diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 15:28:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-11 12:02:50 +0100 |
commit | e5cb267922d146ab1972de7c183982c7cc312e46 (patch) | |
tree | 4869679948200945cd5a64b26ea61f87cfec65ff | |
parent | b96f0217e408700e4b0ce270d3b0322b5d5a9863 (diff) | |
download | poky-e5cb267922d146ab1972de7c183982c7cc312e46.tar.gz |
sstatesig: Anchor inherits class tests
This avoids a nasty sstate hash corruption issue 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 master rev: 943a75a4f3b6877e4092dae14b59b7afef8cad3d)
(From OE-Core rev: 71b15a41652e280aca2a451073a83a25fb4e6f50)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/sstatesig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 1bcaacf6a9..a1efc7b3a0 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -10,9 +10,9 @@ 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 isImage(fn): | 14 | def isImage(fn): |
15 | return "image.bbclass" in " ".join(dataCache.inherits[fn]) | 15 | return "/image.bbclass" in " ".join(dataCache.inherits[fn]) |
16 | 16 | ||
17 | # Always include our own inter-task dependencies | 17 | # Always include our own inter-task dependencies |
18 | if recipename == depname: | 18 | if recipename == depname: |