[oe-commits] Richard Purdie : sstatesig: Anchor inherits class tests

git at git.openembedded.org git at git.openembedded.org
Sun Mar 30 22:45:01 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: 943a75a4f3b6877e4092dae14b59b7afef8cad3d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=943a75a4f3b6877e4092dae14b59b7afef8cad3d

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sun Mar 30 22:49:52 2014 +0000

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 at linuxfoundation.org>

---

 meta/lib/oe/sstatesig.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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:



More information about the Openembedded-commits mailing list