summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-12-11 16:05:49 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-17 17:24:53 +0000
commit3fa98d1dd3bfdbb7af8b125934437a6987ca9370 (patch)
treeb43b49c50024aae627d3cd3c52d714025a6615e0
parent2173ca2fb1942b45bfa532a2c316cbba7f90d823 (diff)
downloadpoky-3fa98d1dd3bfdbb7af8b125934437a6987ca9370.tar.gz
package_rpm: Workaround for 'all' arch multilib package naming
[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. (From OE-Core rev: ea4b8c73a7f807ccd9aa22dfcf41285145a9dd2e) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass14
1 files changed, 12 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 6a0bb91d23..a00b70205c 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -80,6 +80,7 @@ translate_smart_to_oe() {
80 80
81 # Dump installed packages 81 # Dump installed packages
82 while read pkg arch other ; do 82 while read pkg arch other ; do
83 found=0
83 if [ -z "$pkg" ]; then 84 if [ -z "$pkg" ]; then
84 continue 85 continue
85 fi 86 fi
@@ -101,10 +102,19 @@ translate_smart_to_oe() {
101 else 102 else
102 new_pkg="$mlib-$pkg" 103 new_pkg="$mlib-$pkg"
103 fi 104 fi
104 break 105 # Workaround for bug 3565
106 # Simply look to see if we know of a package with that name, if not try again!
107 filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/$new_pkg 2>/dev/null | head -n 1`
108 if [ -n "$filename" ] ; then
109 found=1
110 break
111 fi
112 # 'real' code
113 # found=1
114 # break
105 fi 115 fi
106 done 116 done
107 if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then 117 if [ "$found" = "1" ] && [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then
108 break 118 break
109 fi 119 fi
110 done 120 done