Skip to contentSkip to conversation

RPM complementary package fix

PATCH In review Paul Eggleton 2 participants 3 messages Feb 6, 2013

lore
Share & tools
lore
#0 lore raw

cover RPM complementary package fix

The following changes since commit fdd6da5933a3e7dd1e0ca2afd7107839b4fa65e8:

librsvg: CVE-2011-3146 (2013-01-07 11:31:55 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/danny-rpm-arch
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/danny-rpm-arch

Paul Eggleton (1):
classes/rootfs_rpm: fix missed complementary packages with complex
arch names

 meta/classes/rootfs_rpm.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 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]

---
 meta/classes/rootfs_rpm.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/rootfs_rpm.bbclass +1 -1
index d95ccfa..877845a 100644
@@ -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
Signature · 1 line
1.7.10.4
#2 lore raw

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

Quoted 7 lines · Paul Eggleton

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.

Quoted 6 lines

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]

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

Ross