[oe-commits] Ming Liu : rootfs_rpm.bbclass: fix a regression introduced by list_installed_packages change

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 8567991639fda8d2a1e88169b86c72e14cc6c82d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8567991639fda8d2a1e88169b86c72e14cc6c82d

Author: Ming Liu <ming.liu at windriver.com>
Date:   Thu Nov 29 09:30:12 2012 +0000

rootfs_rpm.bbclass: fix a regression introduced by list_installed_packages change

A regression was introduced by commit:190cb591 that it doesn't
consider the situation that some archs contain "_" originally, so it
results in issues when dealing with archs like qemux86_64, x85_64.

Added a conditional statment in to handle that case.

Signed-off-by: Ming Liu <ming.liu at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/rootfs_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 300dd5f..c4fb470 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -153,7 +153,7 @@ list_installed_packages() {
 
 	# print the info, need to different return counts
 	if [ "$1" = "arch" ] ; then
-		echo "$GET_LIST" | awk '{gsub("_", "-", $2); print $1, $2}'
+		echo "$GET_LIST" | awk -v archs="${PACKAGE_ARCHS}" '{if(!index(archs, $2)) {gsub("_", "-", $2)} print $1, $2}'
         elif [ "$1" = "file" ] ; then
 		echo "$GET_LIST" | awk '{print $1, $3}'
         else