diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2013-03-20 08:29:22 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-11 14:02:27 +0100 |
| commit | c567366d3b933d6a840e793845f81c3ecbe83585 (patch) | |
| tree | c4b49f683b02a8188c101705b2505d507650c436 /meta/classes/package_rpm.bbclass | |
| parent | 092beec1198dbcd707a1501c1a936f5f14ba15f5 (diff) | |
| download | openembedded-core-contrib-c567366d3b933d6a840e793845f81c3ecbe83585.tar.gz | |
package_rpm.bbclass: fix build multilib image failed when PR Server enabled
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]
(From OE-Core rev: cf53c606fc1bc81abb68b6851ae68916f92e1d84)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 12b4bfa536..3a2997637b 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -605,7 +605,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 |