diff options
| author | Ming Liu <ming.liu@windriver.com> | 2012-11-29 09:30:12 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-03 14:41:25 +0000 |
| commit | 8567991639fda8d2a1e88169b86c72e14cc6c82d (patch) | |
| tree | 1fb2ee543ef56e80783b20ff54cf8f65014e220c /meta | |
| parent | f31a7ed3463e169dc93f36cc0bbe084d3f99772a (diff) | |
| download | openembedded-core-8567991639fda8d2a1e88169b86c72e14cc6c82d.tar.gz openembedded-core-8567991639fda8d2a1e88169b86c72e14cc6c82d.tar.bz2 openembedded-core-8567991639fda8d2a1e88169b86c72e14cc6c82d.zip | |
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 <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 300dd5f75d..c4fb470395 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 |