From patchwork Thu Nov 29 09:30:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: rootfs_rpm.bbclass: fix a regression introduced by list_installed_packages change Date: Thu, 29 Nov 2012 09:30:12 -0000 From: Ming Liu X-Patchwork-Id: 39869 Message-Id: <1354181412-2207-1-git-send-email-ming.liu@windriver.com> To: 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 --- meta/classes/rootfs_rpm.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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