Skip to contentSkip to conversation

package_rpm: Ensure package dependencies have correct version numbers

PATCH New Richard Purdie 1 participant 1 message Mar 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package_rpm: Ensure package dependencies have correct version numbers

If a recipe has versioned dependencies on another package within the same recipe, there are potentially races where the version remapping may not happen correctly.

This issue triggered with neard in multilib builds since it uses a "-" character in its PV which is illegal in an rpm version field. The remapping to "+" was not occuring.

It only triggers in the multilib case since in this case, expansion of the datastore happens at slightly different points.

The correct fix is to search for PV, not PKGV but substitute the PV value.

---

meta/classes/package_rpm.bbclass +3 -2
index 3ac379d..8aa868d 100644
@@ -607,8 +607,9 @@ python write_specfile () {
                     if '-' in ver:
                         subd = oe.packagedata.read_subpkgdata_dict(dep, d)
                         if 'PKGV' in subd:
-                            pv = subd['PKGV']
-                            reppv = pv.replace('-', '+')
+                            pv = subd['PV']
+                            pkgv = subd['PKGV']
+                            reppv = pkgv.replace('-', '+')
                             verlist.append(ver.replace(pv, reppv))
                     else:
                         verlist.append(ver)