diff options
| -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 1e6d968520..757173ee2a 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
| @@ -335,12 +335,10 @@ buildhistory_get_installed() { | |||
| 335 | printf "" > $1/installed-package-sizes.tmp | 335 | printf "" > $1/installed-package-sizes.tmp |
| 336 | cat $pkgcache | while read pkg pkgfile pkgarch | 336 | cat $pkgcache | while read pkg pkgfile pkgarch |
| 337 | do | 337 | do |
| 338 | for vendor in ${TARGET_VENDOR} ${MULTILIB_VENDORS} ; do | 338 | size=`oe-pkgdata-util read-value ${PKGDATA_DIR} "PKGSIZE" ${pkg}_${pkgarch}` |
| 339 | size=`oe-pkgdata-util read-value ${PKGDATA_DIR} "PKGSIZE" ${pkg}_${pkgarch}` | 339 | if [ "$size" != "" ] ; then |
| 340 | if [ "$size" != "" ] ; then | 340 | echo "$size $pkg" >> $1/installed-package-sizes.tmp |
| 341 | echo "$size $pkg" >> $1/installed-package-sizes.tmp | 341 | fi |
| 342 | fi | ||
| 343 | done | ||
| 344 | done | 342 | done |
| 345 | cat $1/installed-package-sizes.tmp | sort -n -r | awk '{print $1 "\tKiB " $2}' > $1/installed-package-sizes.txt | 343 | cat $1/installed-package-sizes.tmp | sort -n -r | awk '{print $1 "\tKiB " $2}' > $1/installed-package-sizes.txt |
| 346 | rm $1/installed-package-sizes.tmp | 344 | 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() { | |||
| 506 | if [ "$GLOBS" != "" ] ; then | 506 | if [ "$GLOBS" != "" ] ; then |
| 507 | # Use the magic script to do all the work for us :) | 507 | # Use the magic script to do all the work for us :) |
| 508 | : > ${WORKDIR}/complementary_pkgs.txt | 508 | : > ${WORKDIR}/complementary_pkgs.txt |
| 509 | for vendor in '${TARGET_VENDOR}' ${MULTILIB_VENDORS} ; do | 509 | oe-pkgdata-util glob ${PKGDATA_DIR} ${WORKDIR}/installed_pkgs.txt "$GLOBS" >> ${WORKDIR}/complementary_pkgs.txt |
| 510 | oe-pkgdata-util glob ${PKGDATA_DIR} ${WORKDIR}/installed_pkgs.txt "$GLOBS" >> ${WORKDIR}/complementary_pkgs.txt | ||
| 511 | done | ||
| 512 | 510 | ||
| 513 | # Install the packages, if any | 511 | # Install the packages, if any |
| 514 | sed -i '/^$/d' ${WORKDIR}/complementary_pkgs.txt | 512 | sed -i '/^$/d' ${WORKDIR}/complementary_pkgs.txt |
