Patchwork buildhistory.bbclass/image.bbclass: remove obsolete codes

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Dec. 5, 2013, 1:08 a.m.
Message ID <1386205729-18878-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/62867/
State New
Headers show

Comments

rongqing.li@windriver.com - Dec. 5, 2013, 1:08 a.m.
From: Roy Li <rongqing.li@windriver.com>

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>
---
 meta/classes/buildhistory.bbclass |   10 ++++------
 meta/classes/image.bbclass        |    4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)
Paul Eggleton - Dec. 5, 2013, 12:14 p.m.
Hi Roy,

On Thursday 05 December 2013 09:08:49 rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@windriver.com>
> 
> 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>
> ---
>  meta/classes/buildhistory.bbclass |   10 ++++------
>  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 ec3f0b1..508d028 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 cc65e35..168f283 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

Good catch :)

Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Cheers,
Paul

Patch

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index ec3f0b1..508d028 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 cc65e35..168f283 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