| Submitter | Ming Liu |
|---|---|
| Date | Nov. 29, 2012, 9:30 a.m. |
| Message ID | <1354181412-2207-1-git-send-email-ming.liu@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/39869/ |
| State | Accepted |
| Commit | 8567991639fda8d2a1e88169b86c72e14cc6c82d |
| Headers | show |
Comments
Patch
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
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> --- meta/classes/rootfs_rpm.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)