]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstatesig: Anchor inherits class tests
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 30 Mar 2014 22:49:52 +0000 (22:49 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 30 Mar 2014 22:51:26 +0000 (23:51 +0100)
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>
meta/lib/oe/sstatesig.py

index 8b0e344501eed7015b33615809bbd2ad5910db64..aa25c3a10edd7a521eb0189ea964c6c9ec95a9a5 100644 (file)
@@ -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: