Patchwork sstatesig: Anchor inherits class tests

login
register
mail settings
Submitter Richard Purdie
Date March 30, 2014, 10:53 p.m.
Message ID <1396220030.14790.51.camel@ted>
Download mbox | patch
Permalink /patch/69667/
State New
Headers show

Comments

Richard Purdie - March 30, 2014, 10:53 p.m.
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>
---

Patch

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 8b0e344..aa25c3a 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: