diff options
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 3b4d7c9c10..0a8073f916 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -152,13 +152,18 @@ class ORMWrapper(object): | |||
152 | 152 | ||
153 | def save_target_package_information(self, build_obj, target_obj, packagedict, pkgpnmap, recipes): | 153 | def save_target_package_information(self, build_obj, target_obj, packagedict, pkgpnmap, recipes): |
154 | for p in packagedict: | 154 | for p in packagedict: |
155 | packagedict[p]['object'], created = Package.objects.get_or_create( build = build_obj, name = p ) | 155 | searchname = p |
156 | if 'OPKGN' in pkgpnmap[p].keys(): | ||
157 | searchname = pkgpnmap[p]['OPKGN'] | ||
158 | |||
159 | packagedict[p]['object'], created = Package.objects.get_or_create( build = build_obj, name = searchname ) | ||
156 | if created: | 160 | if created: |
157 | # package was not build in the current build, but | 161 | # package was not build in the current build, but |
158 | # fill in everything we can from the runtime-reverse package data | 162 | # fill in everything we can from the runtime-reverse package data |
159 | try: | 163 | try: |
160 | packagedict[p]['object'].recipe = recipes[pkgpnmap[p]['PN']] | 164 | packagedict[p]['object'].recipe = recipes[pkgpnmap[p]['PN']] |
161 | packagedict[p]['object'].version = pkgpnmap[p]['PV'] | 165 | packagedict[p]['object'].version = pkgpnmap[p]['PV'] |
166 | packagedict[p]['object'].installed_name = p | ||
162 | packagedict[p]['object'].revision = pkgpnmap[p]['PR'] | 167 | packagedict[p]['object'].revision = pkgpnmap[p]['PR'] |
163 | packagedict[p]['object'].license = pkgpnmap[p]['LICENSE'] | 168 | packagedict[p]['object'].license = pkgpnmap[p]['LICENSE'] |
164 | packagedict[p]['object'].section = pkgpnmap[p]['SECTION'] | 169 | packagedict[p]['object'].section = pkgpnmap[p]['SECTION'] |
@@ -209,9 +214,14 @@ class ORMWrapper(object): | |||
209 | 214 | ||
210 | def save_build_package_information(self, build_obj, package_info, recipes): | 215 | def save_build_package_information(self, build_obj, package_info, recipes): |
211 | # create and save the object | 216 | # create and save the object |
217 | pname = package_info['PKG'] | ||
218 | if 'OPKGN' in package_info.keys(): | ||
219 | pname = package_info['OPKGN'] | ||
220 | |||
212 | bp_object, created = Package.objects.get_or_create( build = build_obj, | 221 | bp_object, created = Package.objects.get_or_create( build = build_obj, |
213 | name = package_info['PKG'] ) | 222 | name = pname ) |
214 | 223 | ||
224 | bp_object.installed_name = package_info['PKG'] | ||
215 | bp_object.recipe = recipes[package_info['PN']] | 225 | bp_object.recipe = recipes[package_info['PN']] |
216 | bp_object.version = package_info['PKGV'] | 226 | bp_object.version = package_info['PKGV'] |
217 | bp_object.revision = package_info['PKGR'] | 227 | bp_object.revision = package_info['PKGR'] |