* [for-danny][PATCH 0/1] RPM complementary package fix
@ 2013-02-06 14:07 Paul Eggleton
2013-02-06 14:07 ` [for-danny][PATCH 1/1] classes/rootfs_rpm: fix missed complementary packages with complex arch names Paul Eggleton
0 siblings, 1 reply; 3+ messages in thread
From: Paul Eggleton @ 2013-02-06 14:07 UTC (permalink / raw)
To: openembedded-core, Ross Burton
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(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [for-danny][PATCH 1/1] classes/rootfs_rpm: fix missed complementary packages with complex arch names
2013-02-06 14:07 [for-danny][PATCH 0/1] RPM complementary package fix Paul Eggleton
@ 2013-02-06 14:07 ` Paul Eggleton
2013-02-06 15:30 ` Burton, Ross
0 siblings, 1 reply; 3+ messages in thread
From: Paul Eggleton @ 2013-02-06 14:07 UTC (permalink / raw)
To: openembedded-core, Ross Burton
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(-)
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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [for-danny][PATCH 1/1] classes/rootfs_rpm: fix missed complementary packages with complex arch names
2013-02-06 14:07 ` [for-danny][PATCH 1/1] classes/rootfs_rpm: fix missed complementary packages with complex arch names Paul Eggleton
@ 2013-02-06 15:30 ` Burton, Ross
0 siblings, 0 replies; 3+ messages in thread
From: Burton, Ross @ 2013-02-06 15:30 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-06 15:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-06 14:07 [for-danny][PATCH 0/1] RPM complementary package fix Paul Eggleton
2013-02-06 14:07 ` [for-danny][PATCH 1/1] classes/rootfs_rpm: fix missed complementary packages with complex arch names Paul Eggleton
2013-02-06 15:30 ` Burton, Ross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.