[v3,13/13] package_rpm: Workaround for 'all' arch multilib package naming

Submitted by Paul Eggleton on Dec. 12, 2012, 6:31 p.m.

Details

Message ID 29eace28821e25f2146e8cec3b4246dc74ed6396.1355337025.git.paul.eggleton@linux.intel.com
State Accepted
Commit 3fa98d1dd3bfdbb7af8b125934437a6987ca9370
Headers show

Commit Message

Paul Eggleton Dec. 12, 2012, 6:31 p.m.
From: Mark Hatle <mark.hatle@windriver.com>

[YOCTO #3565]

All packages should not be multilib specific, however when the multilib
rules run, they automatically rename the 'all' target recipes.  As such
there is no way to know if an 'all' package should or should not contain
the multilib prefix.  We workaround this issue in the translate function
by checking to see if the runtime-reverse file exists or not.

The workaround should be removed once a proper solution to the architectural
issue is in place.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/package_rpm.bbclass |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 6a0bb91..a00b702 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -80,6 +80,7 @@  translate_smart_to_oe() {
 
 	# Dump installed packages
 	while read pkg arch other ; do
+		found=0
 		if [ -z "$pkg" ]; then
 			continue
 		fi
@@ -101,10 +102,19 @@  translate_smart_to_oe() {
 					else
 						new_pkg="$mlib-$pkg"
 					fi
-					break
+					# Workaround for bug 3565
+					# Simply look to see if we know of a package with that name, if not try again!
+					filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/$new_pkg 2>/dev/null | head -n 1`
+					if [ -n "$filename" ] ; then
+						found=1
+						break
+					fi
+					# 'real' code
+					# found=1
+					# break
 				fi
 			done
-			if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then
+			if [ "$found" = "1" ] && [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then
 				break
 			fi
 		done