Patchwork [for-danny,1/1] classes/rootfs_rpm: fix missed complementary packages with complex arch names

login
register
mail settings
Submitter Paul Eggleton
Date Feb. 6, 2013, 2:07 p.m.
Message ID <f31f33c04c363ee10814d11430520bee42f5230d.1360159588.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/44209/
State New
Headers show

Comments

Paul Eggleton - Feb. 6, 2013, 2:07 p.m.
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>
---
 meta/classes/rootfs_rpm.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - Feb. 6, 2013, 3:30 p.m.
On 6 February 2013 14:07, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> 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>

Merged to danny-next, will be in the next build run (hopefully tonight).

Ross

Patch

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() {
 
 	# 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