]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstatesig: Anchor inherits class tests
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 Apr 2014 14:28:58 +0000 (15:28 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 11 Apr 2014 11:02:01 +0000 (12:02 +0100)
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)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
meta/lib/oe/sstatesig.py

index 1bcaacf6a9ac10c1da513a70c649fc651bf59cd7..a1efc7b3a0199657e36d8b3df4a72d80546184be 100644 (file)
@@ -10,9 +10,9 @@ 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 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: