From: Paul Eggleton Date: Wed, 6 Feb 2013 14:07:26 +0000 (+0000) Subject: classes/rootfs_rpm: fix missed complementary packages with complex arch names X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e29daf8c3eeb7273e63b6ca6d774b8803880ca46;p=openembedded-core.git 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 --- 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