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-10-30 13:01:22 +0000
commitc97194b0b1aceb09752fe8edd84085757731c2a6 (patch)
tree0625a361922379c92635446bb9270e70c545d5ba
parentef32b9f55d9c6ef1ac8919f6eafac3e2303bfc89 (diff)
downloadast2050-yocto-poky-c97194b0b1aceb09752fe8edd84085757731c2a6.zip
ast2050-yocto-poky-c97194b0b1aceb09752fe8edd84085757731c2a6.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>
-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 354a676..7e080b0 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)
OpenPOWER on IntegriCloud