From: Ming Liu Date: Thu, 29 Nov 2012 09:30:12 +0000 (+0000) Subject: rootfs_rpm.bbclass: fix a regression introduced by list_installed_packages change X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~39345 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8567991639fda8d2a1e88169b86c72e14cc6c82d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 300dd5f75d6..c4fb4703956 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