classes/buildhistory: record size of installed package not compressed archive

* usually it's more important to know how much space will each
  package take on target device then size of compressed package
* example for libewebkit0 with 4 different architectures, interesting
  that om_gta02 .ipk is bigger but it's smaller when installed

  before:
  MACHINE     DEFAULTTUNE       SIZE (.ipk file)
  om_gta04    cortexa8t-neon    15996 KiB libewebkit0
  qemux86_64  x86-64            16992 KiB libewebkit0
  spitz       xscale            16148 KiB libewebkit0
  om_gta02    arm920t           16260 KiB libewebkit0

  after:
  MACHINE     DEFAULTTUNE       SIZE (installed)
  om_gta04    cortexa8t-neon    60544 KiB libewebkit0
  qemux86_64  x86-64            63720 KiB libewebkit0
  spitz       xscale            60588 KiB libewebkit0
  om_gta02    arm920t           56268 KiB libewebkit0

(From OE-Core rev: 85e4a77138381a6086d5ebd3a28cb5a94bc26a19)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

5 files changed, 16 insertions, 12 deletions

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 1c49831978..b2e5cc50e8 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -337,12 +337,14 @@ buildhistory_get_installed() {
 
         # Produce installed package sizes list
         printf "" > $1/installed-package-sizes.tmp
-        cat $pkgcache | while read pkg pkgfile
+        cat $pkgcache | while read pkg pkgfile pkgarch
         do
-                if [ -f $pkgfile ] ; then
-                        pkgsize=`du -k $pkgfile | head -n1 | awk '{ print $1 }'`
-                        echo $pkgsize $pkg >> $1/installed-package-sizes.tmp
-                fi
+                for vendor in ${TARGET_VENDOR} ${MULTILIB_VENDORS} ; do
+                        size=`oe-pkgdata-util read-value ${TMPDIR}/pkgdata $vendor-${TARGET_OS} "PKGSIZE" ${pkg}_${pkgarch}`
+                        if [ "$size" != "" ] ; then
+                                echo "$size $pkg" >> $1/installed-package-sizes.tmp
+                        fi
+                done
         done
         cat $1/installed-package-sizes.tmp | sort -n -r | awk '{print $1 "\tKiB " $2}' > $1/installed-package-sizes.txt
         rm $1/installed-package-sizes.tmp
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 324d83f751..53377a4e7f 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -127,6 +127,8 @@ translate_smart_to_oe() {
                 #echo "$pkg -> $new_pkg" >&2
                 if [ "$arg1" = "arch" ]; then
                         echo $new_pkg $new_arch $other
+                elif [ "$arg1" = "file" ]; then
+                        echo $new_pkg $other $new_arch
                 else
                         echo $new_pkg $other
                 fi
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 3e123ac561..ec116ab187 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -75,13 +75,13 @@ list_installed_packages() {
                 # Here we want the PACKAGE_ARCH not the deb architecture
                 ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch}\n'
         elif [ "$1" = "file" ] ; then
-                ${DPKG_QUERY_COMMAND} -W -f='${Package} ${Package}_${Version}_${Architecture}.deb\n' | while read pkg pkgfile
+                ${DPKG_QUERY_COMMAND} -W -f='${Package} ${Package}_${Version}_${Architecture}.deb ${PackageArch}\n' | while read pkg pkgfile pkgarch
                 do
                         fullpath=`find ${DEPLOY_DIR_DEB} -name "$pkgfile" || true`
                         if [ "$fullpath" = "" ] ; then
-                                echo "$pkg $pkgfile"
+                                echo "$pkg $pkgfile $pkgarch"
                         else
-                                echo "$pkg $fullpath"
+                                echo "$pkg $fullpath $pkgarch"
                         fi
                 done
         else
diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass
index 4e14d9a3a6..04c71af42e 100644
--- a/meta/classes/populate_sdk_ipk.bbclass
+++ b/meta/classes/populate_sdk_ipk.bbclass
@@ -61,13 +61,13 @@ list_installed_packages() {
         if [ "$1" = "arch" ] ; then
                 opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -a
         elif [ "$1" = "file" ] ; then
-                opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -f | while read pkg pkgfile
+                opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -f | while read pkg pkgfile pkgarch
                 do
                         fullpath=`find ${DEPLOY_DIR_IPK} -name "$pkgfile" || true`
                         if [ "$fullpath" = "" ] ; then
-                                echo "$pkg $pkgfile"
+                                echo "$pkg $pkgfile $pkgarch"
                         else
-                                echo "$pkg $fullpath"
+                                echo "$pkg $fullpath $pkgarch"
                         fi
                 done
         else
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index 219cd185ce..dd5f39a100 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -161,7 +161,7 @@ list_installed_packages() {
         if [ "$1" = "arch" ]; then
                 ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe arch
         elif [ "$1" = "file" ]; then
-                ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{PACKAGEORIGIN}\n]" | translate_smart_to_oe
+                ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{PACKAGEORIGIN}\n]" | translate_smart_to_oe file
         else
                 ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe
         fi