summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-02-06 14:07:26 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 15:19:54 (GMT)
commitc0b37584819790a9c72b5dd5ad2533e499fa1d17 (patch)
tree7a2d1d56e2d2f8d420dd0fe7b65b87edc97ee48d
parent4333e88a02549c8205c523e28c8a88ea332affc1 (diff)
downloadpoky-c0b37584819790a9c72b5dd5ad2533e499fa1d17.tar.gz
classes/rootfs_rpm: fix missed complementary packages with complex arch names
If the package architecture name is complex (e.g. with the meta-yocto-bsp beagleboard machine and Poky, the architecture-specific package name is "armv7a-vfp-neon"), rpm reports architecture names that contain underscores instead of dashes, which when passed to oe-pkgdata-util during complementary package processing did not match a valid pkginfo path. Replacing the underscores with dashes again fixes the issue. Note that this bug affects the danny branch and not master since the substitution is already performed there in a different manner. Fixes [YOCTO #3792] (From OE-Core rev: e29daf8c3eeb7273e63b6ca6d774b8803880ca46) Signed-off-by: Paul Eggleton <paul.eggleton@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 d95ccfa..877845a 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -151,7 +151,7 @@ list_installed_packages() {
151 151
152 # print the info, need to different return counts 152 # print the info, need to different return counts
153 if [ "$1" = "arch" ] ; then 153 if [ "$1" = "arch" ] ; then
154 echo "$GET_LIST" | awk '{print $1, $2}' 154 echo "$GET_LIST" | awk '{PN=$1; gsub("_", "-"); print PN, $2}'
155 elif [ "$1" = "file" ] ; then 155 elif [ "$1" = "file" ] ; then
156 echo "$GET_LIST" | awk '{print $1, $3}' 156 echo "$GET_LIST" | awk '{print $1, $3}'
157 else 157 else