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:18:25 +0000
commita16aa96a0831b8cf6039b242b39e9475cab45355 (patch)
tree4ea5fc4cfb673c27ec6bbffc0ae9d163c3c0e418
parent59c7cb37bc2d6abc104a6ab67208a0f765c150f3 (diff)
downloadpoky-a16aa96a0831b8cf6039b242b39e9475cab45355.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) (From OE-Core rev: 6fbe9615bd6667b5634fd471e25412fe627acb09) 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> 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):
109 # remove added nodes from deps_array 109 # remove added nodes from deps_array
110 for item in group: 110 for item in group:
111 for node in self.graph: 111 for node in self.graph:
112 if item in self.graph[node]: 112 if item in self.graph[node].split():
113 self.deps_array[node][0] -= 1 113 self.deps_array[node][0] -= 1
114 114
115 self.deps_array.pop(item, None) 115 self.deps_array.pop(item, None)