| Submitter | Hongxu Jia |
|---|---|
| Date | March 20, 2013, 12:29 a.m. |
| Message ID | <eec6aa898aec7e2941673a1a99e86a163a3e24f6.1363676392.git.hongxu.jia@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/46523/ |
| State | Accepted |
| Commit | e915c0ac6faab824207f0a0227a1f2ac422b3d4f |
| Headers | show |
Comments
Patch
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index b6d76e7..34cf904 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -610,7 +610,14 @@ python write_specfile () { pv = subd['PV'] pkgv = subd['PKGV'] reppv = pkgv.replace('-', '+') - verlist.append(ver.replace(pv, reppv).replace(pkgv, reppv)) + ver = ver.replace(pv, reppv).replace(pkgv, reppv) + if 'PKGR' in subd: + # Make sure PKGR rather than PR in ver + pr = '-' + subd['PR'] + pkgr = '-' + subd['PKGR'] + if pkgr not in ver: + ver = ver.replace(pr, pkgr) + verlist.append(ver) else: verlist.append(ver) newdeps_dict[dep] = verlist
1, In bitbake.conf PKGR ?= "${PR}${EXTENDPRAUTO}" EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}" RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" 2, When PR Server is enabled, EXTENDPRAUTO is not none which means PKGR and PR don't have the same value. 3, When multilib is enabled, RDEPENDS_${PN}-dev is not expanded correctly which uses PR rather than PKGR in the versioned dependency string. 4, Make sure PKGR rather than PR in version string when do_package_rpm. [YOCTO #4050] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/classes/package_rpm.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)