summaryrefslogtreecommitdiffstats
path: root/meta/lib
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:25 +0000
commit80d522a5bc694fdb8b8a53ad4aa36410f3612c6b (patch)
tree2fcfa96b084a64a1d63a21ac18118731fbadd210 /meta/lib
parentf91a3f46a1ee586e330be0868e8fbc4d2e78d361 (diff)
downloadpoky-80d522a5bc694fdb8b8a53ad4aa36410f3612c6b.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 rev: fd085f15e7cd093953f974f69277e130174d551d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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):
14 def isPackageGroup(fn): 14 def isPackageGroup(fn):
15 inherits = " ".join(dataCache.inherits[fn]) 15 inherits = " ".join(dataCache.inherits[fn])
16 return "packagegroup.bbclass" in inherits 16 return "packagegroup.bbclass" in inherits
17 def isImage(fn):
18 return "image.bbclass" in " ".join(dataCache.inherits[fn])
17 19
18 # Always include our own inter-task dependencies 20 # Always include our own inter-task dependencies
19 if recipename == depname: 21 if recipename == depname:
@@ -39,7 +41,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
39 return False 41 return False
40 42
41 # Exclude well defined machine specific configurations which don't change ABI 43 # Exclude well defined machine specific configurations which don't change ABI
42 if depname in siggen.abisaferecipes: 44 if depname in siggen.abisaferecipes and not isImage(fn):
43 return False 45 return False
44 46
45 # Exclude well defined recipe->dependency 47 # Exclude well defined recipe->dependency