All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] toaster: fix target package information
@ 2013-11-05 12:26 Alex DAMIAN
  0 siblings, 0 replies; only message in thread
From: Alex DAMIAN @ 2013-11-05 12:26 UTC (permalink / raw)
  To: bitbake-devel; +Cc: Alexandru DAMIAN

From: Alexandru DAMIAN <alexandru.damian@intel.com>

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]

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---
 bitbake/lib/bb/ui/buildinfohelper.py                 |  2 +-
 bitbake/lib/toaster/bldviewer/templates/package.html | 10 +++++-----
 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>
-- 
1.8.3.2



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-11-05 12:26 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-05 12:26 [PATCH 1/1] toaster: fix target package information Alex DAMIAN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.