[oe-commits] Ming Liu : rootfs_rpm.bbclass: normalize arch output of list_installed_packages

[git at git.openembedded.org]

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

Author: Ming Liu <ming.liu at windriver.com>
Date:   Mon Nov 26 10:24:03 2012 +0800

rootfs_rpm.bbclass: normalize arch output of list_installed_packages

list_installed_packages should output uniform formatted archs for all
packaging system(deb, rpm and ipk), for they are used by common code to
grab the package infos. Otherwise, it will lead some -dbg packages to be
missed processing in come cases.

It's introduced by commit: fc985f51, package_rpm.bbclass: fix the arch
(replace "-" with "_").

Fixed by replacing "_" back to "-" in list_installed_packages, make it
output real arch values which can be safely used.

Signed-off-by: Ming Liu <ming.liu at windriver.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 c86cd09..300dd5f 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 '{print $1, $2}'
+		echo "$GET_LIST" | awk '{gsub("_", "-", $2); print $1, $2}'
         elif [ "$1" = "file" ] ; then
 		echo "$GET_LIST" | awk '{print $1, $3}'
         else