From 84a5c63a57d60b1557268389cf333c69dd841fcd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 14 Dec 2012 16:40:33 -0600 Subject: classes/image: handle multilibs in complementary package lookup For multilib the vendor string is altered, so we need to iterate over all of the multilib vendors when we do the glob processing for complementary packages. (From OE-Core rev: ff01518c6667e1b6e87df4e5a435a701d0f38fa7) Signed-off-by: Paul Eggleton In addition, the RPM package arch have been munged by adding the multilib identifier. This identifier needs to be stripped when generating the installed_packages list for the complementary lookup code to work. Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes/package_rpm.bbclass') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index a00b70205c..05108b26f1 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -99,8 +99,11 @@ translate_smart_to_oe() { if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then if [ "$mlib" = "default" ]; then new_pkg="$pkg" + new_arch=$cmp_arch else new_pkg="$mlib-$pkg" + # We need to strip off the ${mlib}_ prefix on the arch + new_arch=${cmp_arch#${mlib}_} fi # Workaround for bug 3565 # Simply look to see if we know of a package with that name, if not try again! @@ -121,7 +124,7 @@ translate_smart_to_oe() { #echo "$pkg -> $new_pkg" >&2 if [ "$arg1" = "arch" ]; then - echo $new_pkg $cmp_arch $other + echo $new_pkg $new_arch $other else echo $new_pkg $other fi -- cgit v1.2.3-54-g00ecf