summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2012-11-26 10:24:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 13:52:07 +0000
commit48e657f65458c148ae5d56e213276148eb6d1ff0 (patch)
tree19b84664ba6fc7686ffcd85fa2966c56d2738ea9 /meta
parentb751ec137d0228b40a90e9e32b24f5cb5732225b (diff)
downloadpoky-48e657f65458c148ae5d56e213276148eb6d1ff0.tar.gz
rootfs_rpm.bbclass: normalize arch output of list_installed_packages
list_installed_packages should output uniform formatted archs for all packaging system(deb, rpm and ipk), for they are used by common code to grab the package infos. Otherwise, it will lead some -dbg packages to be missed processing in come cases. It's introduced by commit: fc985f51, package_rpm.bbclass: fix the arch (replace "-" with "_"). Fixed by replacing "_" back to "-" in list_installed_packages, make it output real arch values which can be safely used. (From OE-Core rev: 554f2436435bf96c6735827f491c1b78b198c016) Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 c86cd094ff..300dd5f75d 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 '{print $1, $2}' 156 echo "$GET_LIST" | awk '{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