mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: lib/bb/ui: handle PKGSIZE change to bytes

Browse Source 
PKGSIZE is now in bytes in pkgdata, so we need to treat it as such in
the UI code for Hob / Toaster.

(Bitbake rev: 3b5ff814cd4a3efa4b17c6b343ec39c9acca5c9e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2013-12-02 18:58:45 +00:00
committed by Richard Purdie
parent d1e66643ae
commit 8a02406f1c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/buildinfohelper.py
+1 -1
View File
@@ -188,7 +188,7 @@ class ORMWrapper(object):
revision = package_info['PKGR'], revision = package_info['PKGR'],
summary = package_info['SUMMARY'], summary = package_info['SUMMARY'],
description = package_info['DESCRIPTION'], description = package_info['DESCRIPTION'],
size = int(package_info['PKGSIZE']) * 1024, size = int(package_info['PKGSIZE']),
section = package_info['SECTION'], section = package_info['SECTION'],
license = package_info['LICENSE'], license = package_info['LICENSE'],
) )
bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+3 -4
View File
@@ -251,7 +251,7 @@ class PackageListModel(gtk.ListStore):
pkgv = getpkgvalue(pkginfo, 'PKGV', pkg) pkgv = getpkgvalue(pkginfo, 'PKGV', pkg)
pkgr = getpkgvalue(pkginfo, 'PKGR', pkg) pkgr = getpkgvalue(pkginfo, 'PKGR', pkg)
# PKGSIZE is artificial, will always be overridden with the package name if present # PKGSIZE is artificial, will always be overridden with the package name if present
pkgsize = pkginfo.get('PKGSIZE_%s' % pkg, "0") pkgsize = int(pkginfo.get('PKGSIZE_%s' % pkg, "0"))
# PKG_%s is the renamed version # PKG_%s is the renamed version
pkg_rename = pkginfo.get('PKG_%s' % pkg, "") pkg_rename = pkginfo.get('PKG_%s' % pkg, "")
# The rest may be overridden or not # The rest may be overridden or not
@@ -268,11 +268,10 @@ class PackageListModel(gtk.ListStore):
allow_empty = getpkgvalue(pkginfo, 'ALLOW_EMPTY', pkg, "") allow_empty = getpkgvalue(pkginfo, 'ALLOW_EMPTY', pkg, "")
if pkgsize == "0" and not allow_empty: if pkgsize == 0 and not allow_empty:
continue continue
# pkgsize is in KB size = HobPage._size_to_string(pkgsize)
size = HobPage._size_to_string(HobPage._string_to_size(pkgsize + ' KB'))
self.set(self.append(), self.COL_NAME, pkg, self.COL_VER, pkgv, self.set(self.append(), self.COL_NAME, pkg, self.COL_VER, pkgv,
self.COL_REV, pkgr, self.COL_RNM, pkg_rename, self.COL_REV, pkgr, self.COL_RNM, pkg_rename,
self.COL_SEC, section, self.COL_SUM, summary, self.COL_SEC, section, self.COL_SUM, summary,