diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2013-12-05 09:08:49 +0800 |
|---|---|---|
| committer |   Andreas Oberritter <obi@opendreambox.org> | 2015-02-23 16:51:54 +0100 |
| commit | c360457ba552d7c35b5aa028fe72a5ddc6a7a26e (patch) | |
| tree | 370bb615dab55fad5476e23530e58dbb61f10522 /meta/classes | |
| parent | cc445284172ef847654b3ecfcde25e2700dd0d97 (diff) | |
| download | openembedded-core-contrib-c360457ba552d7c35b5aa028fe72a5ddc6a7a26e.tar.gz | |
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>
(cherry picked from commit 03c5f39b4d7dd8c81e0a130b7d5884e5af039a24)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 10 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 3da03c8485..0412327069 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -339,12 +339,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 aaaa2241a1..99d13c6339 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -488,9 +488,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 |