summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-27 15:32:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-29 10:49:18 +0000
commitfd085f15e7cd093953f974f69277e130174d551d (patch)
tree6a784355915bcce76aece61b7488f079b86be788
parentc9289c506633ffe5c482000d8d225e45454c064d (diff)
downloadopenembedded-core-fd085f15e7cd093953f974f69277e130174d551d.tar.gz
openembedded-core-fd085f15e7cd093953f974f69277e130174d551d.tar.bz2
openembedded-core-fd085f15e7cd093953f974f69277e130174d551d.zip
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. Editting 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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/sstatesig.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 33ff8929b3..329c84d366 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -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