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>
This commit is contained in:
Otavio Salvador
2015-10-13 12:29:37 -03:00
committed by Richard Purdie
parent d302c98822
commit 556c0ea92e

View File

@@ -54,14 +54,16 @@ class ImageDepGraph(object):
base_type = self._image_base_type(node)
deps = (self.d.getVar('IMAGE_TYPEDEP_' + node, True) or "")
base_deps = (self.d.getVar('IMAGE_TYPEDEP_' + base_type, True) or "")
if deps != "" or base_deps != "":
graph[node] = deps
for dep in deps.split() + base_deps.split():
if not dep in graph:
add_node(dep)
else:
graph[node] = ""
graph[node] = ""
for dep in deps.split() + base_deps.split():
if not dep in graph[node]:
if graph[node] != "":
graph[node] += " "
graph[node] += dep
if not dep in graph:
add_node(dep)
for fstype in image_fstypes:
add_node(fstype)