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:30 +0100 |
commit | 8a917985df45896ad5115264385c8b766cc06d32 (patch) | |
tree | 5aafcd410a87c70f98fea805640df21b8e0b536a /meta | |
parent | d0873800fd0a38504b7385f3938bc1b6650e1925 (diff) | |
download | poky-8a917985df45896ad5115264385c8b766cc06d32.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: e915c0ac6faab824207f0a0227a1f2ac422b3d4f)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () { | |||
605 | pv = subd['PV'] | 605 | pv = subd['PV'] |
606 | pkgv = subd['PKGV'] | 606 | pkgv = subd['PKGV'] |
607 | reppv = pkgv.replace('-', '+') | 607 | reppv = pkgv.replace('-', '+') |
608 | verlist.append(ver.replace(pv, reppv).replace(pkgv, reppv)) | 608 | ver = ver.replace(pv, reppv).replace(pkgv, reppv) |
609 | if 'PKGR' in subd: | ||
610 | # Make sure PKGR rather than PR in ver | ||
611 | pr = '-' + subd['PR'] | ||
612 | pkgr = '-' + subd['PKGR'] | ||
613 | if pkgr not in ver: | ||
614 | ver = ver.replace(pr, pkgr) | ||
615 | verlist.append(ver) | ||
609 | else: | 616 | else: |
610 | verlist.append(ver) | 617 | verlist.append(ver) |
611 | newdeps_dict[dep] = verlist | 618 | newdeps_dict[dep] = verlist |