aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2014-10-24 09:41:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:00:32 +0000
commitcec9725c540c2d54c27092e40d159694cea75b5f (patch)
tree2522e7498148b9b534bdd529e564afe2a7a1cb69
parent2645c07892abe79f73379b1ca4196f593cb3b330 (diff)
downloadopenembedded-core-contrib-cec9725c540c2d54c27092e40d159694cea75b5f.tar.gz
openembedded-core-contrib-cec9725c540c2d54c27092e40d159694cea75b5f.tar.bz2
openembedded-core-contrib-cec9725c540c2d54c27092e40d159694cea75b5f.zip
image.py: Fix error in graph sorting
The graph sorting algorithm for image dependencies does a look for an occurrence of a searched string instead of comparing the chunk to the searched string. This leads to the problem that ubifs is recognized as ubi aswell. This fixes this by splitting up the string into chunks. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/image.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 354a676f42..7e080b00dd 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -109,7 +109,7 @@ class ImageDepGraph(object):
# remove added nodes from deps_array
for item in group:
for node in self.graph:
- if item in self.graph[node]:
+ if item in self.graph[node].split():
self.deps_array[node][0] -= 1
self.deps_array.pop(item, None)