summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-16 15:46:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-16 17:07:32 +0000
commit0f8447a7d99d2645b932eac1c24149f0c2d3791e (patch)
treeb1153a85e3d429ef59f91df23fd445d58e83c718 /meta/classes
parentf46cf86d0ec3b80ce526b4dad1b1eac5995969ec (diff)
downloadopenembedded-core-0f8447a7d99d2645b932eac1c24149f0c2d3791e.tar.gz
openembedded-core-0f8447a7d99d2645b932eac1c24149f0c2d3791e.tar.bz2
openembedded-core-0f8447a7d99d2645b932eac1c24149f0c2d3791e.zip
package_rpm: Ensure PV manipulations are correct
The previous change to this function fixed one manipuation at the expense of the other, depending on ow expanded the versioned dependency string was when the AUTOINC substitution was made. This update ensures we cover both cases and ensures the classextended version works as as well as the normal case. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 8aa868d3a2..b6d76e7a3b 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -610,7 +610,7 @@ python write_specfile () {
pv = subd['PV']
pkgv = subd['PKGV']
reppv = pkgv.replace('-', '+')
- verlist.append(ver.replace(pv, reppv))
+ verlist.append(ver.replace(pv, reppv).replace(pkgv, reppv))
else:
verlist.append(ver)
newdeps_dict[dep] = verlist