aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-27 15:32:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-11 12:02:01 +0100
commit946ec90c5de1faa18c899e9b45efedc3d47b93bd (patch)
tree14351daeff7b6c9dbe8ee107d5db3456dab5b95c
parentc3acfdfe0c0c3579c5f469f10b87a2926214ba5d (diff)
downloadopenembedded-core-contrib-946ec90c5de1faa18c899e9b45efedc3d47b93bd.tar.gz
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. (From OE-Core master rev: fd085f15e7cd093953f974f69277e130174d551d) 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 852fb7e64a..1bcaacf6a9 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -11,6 +11,8 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
def isKernel(fn):
inherits = " ".join(dataCache.inherits[fn])
return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1
+ def isImage(fn):
+ return "image.bbclass" in " ".join(dataCache.inherits[fn])
# Always include our own inter-task dependencies
if recipename == depname:
@@ -32,7 +34,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