summaryrefslogtreecommitdiffstats
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-12-31 10:17:02 +0000
commit6fbe9615bd6667b5634fd471e25412fe627acb09 (patch)
tree8db4d95889349521245826ab6581c9dcf2f1cba2
parent2c327f75c293a68c39b46d72a27248d72ac80996 (diff)
downloadopenembedded-core-contrib-6fbe9615bd6667b5634fd471e25412fe627acb09.tar.gz
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. (From OE-Core rev: cec9725c540c2d54c27092e40d159694cea75b5f) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-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)