summaryrefslogtreecommitdiffstats
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:49 +0100
commit8d0f411fdbc209895d0f8958d156dc0561d61161 (patch)
treea2f7740926a1c8f4566fb769aa610dc635c87be4
parent609ae3928477294e769b9aee54b818c625723b14 (diff)
downloadpoky-8d0f411fdbc209895d0f8958d156dc0561d61161.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) (From OE-Core rev: 946ec90c5de1faa18c899e9b45efedc3d47b93bd) 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):
11 def isKernel(fn): 11 def isKernel(fn):
12 inherits = " ".join(dataCache.inherits[fn]) 12 inherits = " ".join(dataCache.inherits[fn])
13 return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1 13 return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1
14 def isImage(fn):
15 return "image.bbclass" in " ".join(dataCache.inherits[fn])
14 16
15 # Always include our own inter-task dependencies 17 # Always include our own inter-task dependencies
16 if recipename == depname: 18 if recipename == depname:
@@ -32,7 +34,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
32 return False 34 return False
33 35
34 # Exclude well defined machine specific configurations which don't change ABI 36 # Exclude well defined machine specific configurations which don't change ABI
35 if depname in siggen.abisaferecipes: 37 if depname in siggen.abisaferecipes and not isImage(fn):
36 return False 38 return False
37 39
38 # Exclude well defined recipe->dependency 40 # Exclude well defined recipe->dependency