summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-10-13 12:29:37 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-14 18:08:37 +0300
commit556c0ea92eb32ddb9c9a5e30a74b2ca24ac69c68 (patch)
tree2a75afe64b12e91c8132fbcd138f896931e8b65e
parentd302c98822efe2cb78a63b620aed1b94b4ed4a68 (diff)
downloadpoky-556c0ea92eb32ddb9c9a5e30a74b2ca24ac69c68.tar.gz
lib/oe/image.py: Fix dependency handling for compressed types
The dependency code needs to also include the dependency of base types. For example: - sdcard.gz image with ext4 The dependency chain needs to include: - sdcard - ext4 - gz Until this change, the ext4 dependency were not being taken into account when using the compressed one. (From OE-Core rev: 10e5df3503632a6e1c54612055b19f7258c3ae2f) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/image.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index b0d81a6b22..b9eb3de5aa 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -54,14 +54,16 @@ class ImageDepGraph(object):
54 base_type = self._image_base_type(node) 54 base_type = self._image_base_type(node)
55 deps = (self.d.getVar('IMAGE_TYPEDEP_' + node, True) or "") 55 deps = (self.d.getVar('IMAGE_TYPEDEP_' + node, True) or "")
56 base_deps = (self.d.getVar('IMAGE_TYPEDEP_' + base_type, True) or "") 56 base_deps = (self.d.getVar('IMAGE_TYPEDEP_' + base_type, True) or "")
57 if deps != "" or base_deps != "": 57
58 graph[node] = deps 58 graph[node] = ""
59 59 for dep in deps.split() + base_deps.split():
60 for dep in deps.split() + base_deps.split(): 60 if not dep in graph[node]:
61 if not dep in graph: 61 if graph[node] != "":
62 add_node(dep) 62 graph[node] += " "
63 else: 63 graph[node] += dep
64 graph[node] = "" 64
65 if not dep in graph:
66 add_node(dep)
65 67
66 for fstype in image_fstypes: 68 for fstype in image_fstypes:
67 add_node(fstype) 69 add_node(fstype)