summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2012-11-29 09:30:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:47:55 +0000
commit8880840f36fcb53342c6700a4144511ff439a3e3 (patch)
tree000b36bc4b69c858db70256978d94c6c8119cca2
parentedd8d597717b39086316eb25699e7e2a64634d7d (diff)
downloadpoky-8880840f36fcb53342c6700a4144511ff439a3e3.tar.gz
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. (From OE-Core rev: 8567991639fda8d2a1e88169b86c72e14cc6c82d) Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 300dd5f75d..c4fb470395 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -153,7 +153,7 @@ list_installed_packages() {
153 153
154 # print the info, need to different return counts 154 # print the info, need to different return counts
155 if [ "$1" = "arch" ] ; then 155 if [ "$1" = "arch" ] ; then
156 echo "$GET_LIST" | awk '{gsub("_", "-", $2); print $1, $2}' 156 echo "$GET_LIST" | awk -v archs="${PACKAGE_ARCHS}" '{if(!index(archs, $2)) {gsub("_", "-", $2)} print $1, $2}'
157 elif [ "$1" = "file" ] ; then 157 elif [ "$1" = "file" ] ; then
158 echo "$GET_LIST" | awk '{print $1, $3}' 158 echo "$GET_LIST" | awk '{print $1, $3}'
159 else 159 else