buildhistory.bbclass/image.bbclass: remove obsolete codes

After 1b8e4abd2d9c0 [bitbake.conf/package: Collapse PKGDATA_DIR into
a single machine specific directory], oe-pkgdata-util does not use
target_suffix parameter, so do not need to loop the vendor

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 1e6d968520f9601660dbaac68a3fe2de08fc96f3..757173ee2a7979b262728294b84ad56ef5716f65 100644 (file)
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -335,12 +335,10 @@ buildhistory_get_installed() {
        printf "" > $1/installed-package-sizes.tmp
        cat $pkgcache | while read pkg pkgfile pkgarch
        do
-               for vendor in ${TARGET_VENDOR} ${MULTILIB_VENDORS} ; do
-                       size=`oe-pkgdata-util read-value ${PKGDATA_DIR} "PKGSIZE" ${pkg}_${pkgarch}`
-                       if [ "$size" != "" ] ; then
-                               echo "$size $pkg" >> $1/installed-package-sizes.tmp
-                       fi
-               done
+               size=`oe-pkgdata-util read-value ${PKGDATA_DIR} "PKGSIZE" ${pkg}_${pkgarch}`
+               if [ "$size" != "" ] ; then
+                       echo "$size $pkg" >> $1/installed-package-sizes.tmp
+               fi
        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/image.bbclass b/meta/classes/image.bbclass
index cc65e3566dedb36fec062d95af85f543fb43a45d..168f28369689fe2515528f19721c1ad539181dba 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -506,9 +506,7 @@ rootfs_install_complementary() {
     if [ "$GLOBS" != "" ] ; then
         # Use the magic script to do all the work for us :)
         : > ${WORKDIR}/complementary_pkgs.txt
-        for vendor in '${TARGET_VENDOR}' ${MULTILIB_VENDORS} ; do
-            oe-pkgdata-util glob ${PKGDATA_DIR} ${WORKDIR}/installed_pkgs.txt "$GLOBS" >> ${WORKDIR}/complementary_pkgs.txt
-        done
+        oe-pkgdata-util glob ${PKGDATA_DIR} ${WORKDIR}/installed_pkgs.txt "$GLOBS" >> ${WORKDIR}/complementary_pkgs.txt
 
         # Install the packages, if any
         sed -i '/^$/d' ${WORKDIR}/complementary_pkgs.txt