summaryrefslogtreecommitdiffstats
path: root/bitbake
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:44 +0000
commit57498cede4696526c121e0112b5dea3e6e8365ac (patch)
treed346c56984017fed8b3d08982c29f73a491ac61d /bitbake
parent9160f376065752e2e92c8b37ee9a80d0eb86b53b (diff)
downloadpoky-57498cede4696526c121e0112b5dea3e6e8365ac.tar.gz
bitbake: toaster: fix target package information
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>
Diffstat (limited to 'bitbake')
-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 2ca0bd380e..fbf75466d0 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -548,7 +548,7 @@ class BuildInfoHelper(object):
548 548
549 MACHINE_ARCH, error = self.server.runCommand(['getVariable', 'MACHINE_ARCH']) 549 MACHINE_ARCH, error = self.server.runCommand(['getVariable', 'MACHINE_ARCH'])
550 TCLIBC, error = self.server.runCommand(['getVariable', 'TCLIBC']) 550 TCLIBC, error = self.server.runCommand(['getVariable', 'TCLIBC'])
551 BUILDHISTORY_DIR = self.server.runCommand(['getVariable', 'BUILDHISTORY_DIR']) 551 BUILDHISTORY_DIR, error = self.server.runCommand(['getVariable', 'BUILDHISTORY_DIR'])
552 BUILDHISTORY_DIR_IMAGE = "%s/images/%s/%s/%s" % (BUILDHISTORY_DIR, MACHINE_ARCH, TCLIBC, target.target) 552 BUILDHISTORY_DIR_IMAGE = "%s/images/%s/%s/%s" % (BUILDHISTORY_DIR, MACHINE_ARCH, TCLIBC, target.target)
553 553
554 self.internal_state['packages'] = {} 554 self.internal_state['packages'] = {}
diff --git a/bitbake/lib/toaster/bldviewer/templates/package.html b/bitbake/lib/toaster/bldviewer/templates/package.html
index 642fcab9a1..c22e988e95 100644
--- a/bitbake/lib/toaster/bldviewer/templates/package.html
+++ b/bitbake/lib/toaster/bldviewer/templates/package.html
@@ -19,12 +19,12 @@
19 <td><a name="#{{package.name}}">{{package.name}}</a></td> 19 <td><a name="#{{package.name}}">{{package.name}}</a></td>
20 <td>{{package.version}}</td> 20 <td>{{package.version}}</td>
21 <td>{{package.size}}</td> 21 <td>{{package.size}}</td>
22 <td><a name="{{package.recipe.name}}.{{package.package_name}}"> 22 <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}">
23 <a href="{% url layer_versions_recipes package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a></td> 23 <a href="{% url layer_versions_recipes package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
24 <td> 24 <td>
25 <div style="height: 3em; overflow:auto"> 25 <div style="height: 4em; overflow:auto">
26 {% for d in package.depends_on %} 26 {% for d in package.tpackage_dependencies_package.all %}
27 <a href="#{{d.name}}">{{d.name}}</a><br/> 27 <a href="#{{d.name}}">{{d.depends_on.name}}</a><br/>
28 {% endfor %} 28 {% endfor %}
29 </div> 29 </div>
30 </td> 30 </td>