Patchwork rootfs_rpm.bbclass: normalize arch output of list_installed_packages

login
register
mail settings
Submitter Ming Liu
Date Nov. 26, 2012, 2:24 a.m.
Message ID <1353896643-25812-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/39603/
State Accepted
Commit 48e657f65458c148ae5d56e213276148eb6d1ff0
Headers show

Comments

Ming Liu - Nov. 26, 2012, 2:24 a.m.
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@windriver.com>
---
 meta/classes/rootfs_rpm.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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