summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-02-06 14:07:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 15:17:17 +0000
commite29daf8c3eeb7273e63b6ca6d774b8803880ca46 (patch)
treeeb9c4f6289443ad26a9f3dcd0091dc68f75a6200
parentc92320406ca8874b5862be5386dae80854a1a550 (diff)
downloadopenembedded-core-e29daf8c3eeb7273e63b6ca6d774b8803880ca46.tar.gz
openembedded-core-e29daf8c3eeb7273e63b6ca6d774b8803880ca46.tar.bz2
openembedded-core-e29daf8c3eeb7273e63b6ca6d774b8803880ca46.zip
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] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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 d95ccfad2b..877845a4e8 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -151,7 +151,7 @@ list_installed_packages() {
# print the info, need to different return counts
if [ "$1" = "arch" ] ; then
- echo "$GET_LIST" | awk '{print $1, $2}'
+ echo "$GET_LIST" | awk '{PN=$1; gsub("_", "-"); print PN, $2}'
elif [ "$1" = "file" ] ; then
echo "$GET_LIST" | awk '{print $1, $3}'
else