From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 30 Mar 2014 22:49:52 +0000 (+0000)
Subject: sstatesig: Anchor inherits class tests
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34003
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=943a75a4f3b6877e4092dae14b59b7afef8cad3d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

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