summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2013-11-05 12:26:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-05 12:50:58 +0000
commite5cf3e598e1e36b87a6cb07829f8a5013d78f534 (patch)
tree056da81e3b2c012b7635dbea30f4f9973d02e2ad
parent46814c99eed399b6dd9ff9e83260fefe79c23ec8 (diff)
downloadpoky-e5cf3e598e1e36b87a6cb07829f8a5013d78f534.zip
poky-e5cf3e598e1e36b87a6cb07829f8a5013d78f534.tar.gz
poky-e5cf3e598e1e36b87a6cb07829f8a5013d78f534.tar.bz2
bitbake: toaster: fix target package informationtoaster-dora-10.0.0
Toaster needs to record information about packages installed on a built target image, and dependencies between these packages. This patch fixes a bug where the variable from the server wasn't read correctly leading which caused the buildhistory to not be processed correctly. Additionally, two display issues in the package table were fixed, issues that lead to package information being displayed incorrectly. [YOCTO #5197] (Bitbake rev: ab4bc18409d80de6d069e3dd76c3c54964fe5764) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py2
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/package.html10
2 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 2ca0bd3..fbf7546 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -548,7 +548,7 @@ class BuildInfoHelper(object):
MACHINE_ARCH, error = self.server.runCommand(['getVariable', 'MACHINE_ARCH'])
TCLIBC, error = self.server.runCommand(['getVariable', 'TCLIBC'])
- BUILDHISTORY_DIR = self.server.runCommand(['getVariable', 'BUILDHISTORY_DIR'])
+ BUILDHISTORY_DIR, error = self.server.runCommand(['getVariable', 'BUILDHISTORY_DIR'])
BUILDHISTORY_DIR_IMAGE = "%s/images/%s/%s/%s" % (BUILDHISTORY_DIR, MACHINE_ARCH, TCLIBC, target.target)
self.internal_state['packages'] = {}
diff --git a/bitbake/lib/toaster/bldviewer/templates/package.html b/bitbake/lib/toaster/bldviewer/templates/package.html
index 642fcab..c22e988 100644
--- a/bitbake/lib/toaster/bldviewer/templates/package.html
+++ b/bitbake/lib/toaster/bldviewer/templates/package.html
@@ -19,12 +19,12 @@
<td><a name="#{{package.name}}">{{package.name}}</a></td>
<td>{{package.version}}</td>
<td>{{package.size}}</td>
- <td><a name="{{package.recipe.name}}.{{package.package_name}}">
- <a href="{% url layer_versions_recipes package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a></td>
+ <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}">
+ <a href="{% url layer_versions_recipes package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
<td>
- <div style="height: 3em; overflow:auto">
- {% for d in package.depends_on %}
- <a href="#{{d.name}}">{{d.name}}</a><br/>
+ <div style="height: 4em; overflow:auto">
+ {% for d in package.tpackage_dependencies_package.all %}
+ <a href="#{{d.name}}">{{d.depends_on.name}}</a><br/>
{% endfor %}
</div>
</td>