summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/buildhistory.bbclass10
-rw-r--r--meta/classes/image.bbclass4
2 files changed, 5 insertions, 9 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 1e6d968520..757173ee2a 100644
--- 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 cc65e3566d..168f283696 100644
--- 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