From: Otavio Salvador Date: Tue, 13 Oct 2015 15:29:37 +0000 (-0300) Subject: lib/oe/image.py: Fix dependency handling for compressed types X-Git-Tag: 2015-10~119 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=10e5df3503632a6e1c54612055b19f7258c3ae2f;p=openembedded-core.git 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. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- 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): 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)