mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

package_rpm.bbclass: fix build multilib image failed when PR Server enabled

Browse Source 
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>
This commit is contained in:
Hongxu Jia
2013-03-20 08:29:22 +08:00
committed by Richard Purdie
parent d0873800fd
commit 8a917985df
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package_rpm.bbclass
+8 -1
View File
@@ -605,7 +605,14 @@ python write_specfile () {
pv = subd['PV'] pv = subd['PV']
pkgv = subd['PKGV'] pkgv = subd['PKGV']
reppv = pkgv.replace('-', '+') 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: else:
verlist.append(ver) verlist.append(ver)
newdeps_dict[dep] = verlist newdeps_dict[dep] = verlist