diff options
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/tasklistmodel.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py index fa16609678..b0f5d7a7b6 100644 --- a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py | |||
@@ -239,10 +239,11 @@ class TaskListModel(gtk.ListStore): | |||
239 | elif ('-image-' in name): | 239 | elif ('-image-' in name): |
240 | atype = 'image' | 240 | atype = 'image' |
241 | 241 | ||
242 | # Create a combined list of build and runtime dependencies and | ||
243 | # then remove any duplicate entries and any entries for -dev | ||
244 | # packages | ||
242 | depends = event_model["depends"].get(item, []) | 245 | depends = event_model["depends"].get(item, []) |
243 | rdepends = event_model["rdepends-pn"].get(item, []) | 246 | rdepends = event_model["rdepends-pn"].get(item, []) |
244 | if ("%s-dev" % item) in rdepends: | ||
245 | rdepends.remove("%s-dev" % item) | ||
246 | packages = {} | 247 | packages = {} |
247 | for pkg in event_model["packages"]: | 248 | for pkg in event_model["packages"]: |
248 | if event_model["packages"][pkg]["pn"] == name: | 249 | if event_model["packages"][pkg]["pn"] == name: |
@@ -250,6 +251,13 @@ class TaskListModel(gtk.ListStore): | |||
250 | deps.extend(depends) | 251 | deps.extend(depends) |
251 | deps.extend(event_model["rdepends-pkg"].get(pkg, [])) | 252 | deps.extend(event_model["rdepends-pkg"].get(pkg, [])) |
252 | deps.extend(rdepends) | 253 | deps.extend(rdepends) |
254 | deps = self.squish(deps) | ||
255 | # rdepends-pn includes pn-dev | ||
256 | if ("%s-dev" % item) in deps: | ||
257 | deps.remove("%s-dev" % item) | ||
258 | # rdepends-on includes pn | ||
259 | if pkg in deps: | ||
260 | deps.remove(pkg) | ||
253 | packages[pkg] = deps | 261 | packages[pkg] = deps |
254 | 262 | ||
255 | for p in packages: | 263 | for p in packages: |