Skip to contentSkip to conversation

sstatesig.py: Fix image regeneration issue

PATCH New Richard Purdie 1 participant 1 message Nov 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sstatesig.py: Fix image regeneration issue

With the "ABI safe" recipes, we've been excluding those from signatures. This is fine in the general case but in the specific case of image recipes it breaks.

A good test case is the interfaces file. Editing this causes init-ifupdown to rebuild but not an image containing it (e.g. core-image-minimal).

We need to ensure the checksums are added to the image recipes and this change does that.

[YOCTO #5585]

---

meta/lib/oe/sstatesig.py +3 -1
index 33ff892..329c84d 100644
@@ -14,6 +14,8 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
     def isPackageGroup(fn):
         inherits = " ".join(dataCache.inherits[fn])
         return "packagegroup.bbclass" in inherits
+    def isImage(fn):
+        return "image.bbclass" in " ".join(dataCache.inherits[fn])
 
     # Always include our own inter-task dependencies
     if recipename == depname:
@@ -39,7 +41,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
         return False
 
     # Exclude well defined machine specific configurations which don't change ABI
-    if depname in siggen.abisaferecipes:
+    if depname in siggen.abisaferecipes and not isImage(fn):
         return False
 
     # Exclude well defined recipe->dependency