summaryrefslogtreecommitdiffstats
path: root/meta
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:08:25 +0000
commitb5e5d25c25f30db1f9855e24afef9d8f0bb77d35 (patch)
treee251a22561291810d7bba9edf80931763b4367a1 /meta
parent1ceb13dda11645229053fc4840954333f8910ba4 (diff)
downloadpoky-b5e5d25c25f30db1f9855e24afef9d8f0bb77d35.tar.gz
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. (From OE-Core rev: 0f8447a7d99d2645b932eac1c24149f0c2d3791e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
610 pv = subd['PV'] 610 pv = subd['PV']
611 pkgv = subd['PKGV'] 611 pkgv = subd['PKGV']
612 reppv = pkgv.replace('-', '+') 612 reppv = pkgv.replace('-', '+')
613 verlist.append(ver.replace(pv, reppv)) 613 verlist.append(ver.replace(pv, reppv).replace(pkgv, reppv))
614 else: 614 else:
615 verlist.append(ver) 615 verlist.append(ver)
616 newdeps_dict[dep] = verlist 616 newdeps_dict[dep] = verlist