summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 22:49:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 23:51:26 +0100
commit943a75a4f3b6877e4092dae14b59b7afef8cad3d (patch)
tree144bc7ce3ac1d67e5dd04a6a8020dd4895c0f0e8
parent3366da30f32653ce0dc28878029df81c5ca9bcc5 (diff)
downloadopenembedded-core-contrib-943a75a4f3b6877e4092dae14b59b7afef8cad3d.tar.gz
openembedded-core-contrib-943a75a4f3b6877e4092dae14b59b7afef8cad3d.tar.bz2
openembedded-core-contrib-943a75a4f3b6877e4092dae14b59b7afef8cad3d.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/sstatesig.py6
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):
return x.startswith("nativesdk-")
def isKernel(fn):
inherits = " ".join(dataCache.inherits[fn])
- return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1
+ return inherits.find("/module-base.bbclass") != -1 or inherits.find("/linux-kernel-base.bbclass") != -1
def isPackageGroup(fn):
inherits = " ".join(dataCache.inherits[fn])
- return "packagegroup.bbclass" in inherits
+ return "/packagegroup.bbclass" in inherits
def isImage(fn):
- return "image.bbclass" in " ".join(dataCache.inherits[fn])
+ return "/image.bbclass" in " ".join(dataCache.inherits[fn])
# Always include our own inter-task dependencies
if recipename == depname: