diff options
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 14 |
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 |