Skip to contentSkip to conversation

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

PATCH New Hongxu Jia 1 participant 2 messages Mar 20, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

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

The following changes since commit 87cfde2559daec564731c5c25df04eec27eaf7d5:

syslinux.bbclass: Add a default serial console option and real boot menu support (2013-03-18 21:42:24 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-multilib-rpm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-multilib-rpm

Hongxu Jia (1):
package_rpm.bbclass: fix build multilib image failed when PR Server
enabled

 meta/classes/package_rpm.bbclass |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 1/1 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]

---
 meta/classes/package_rpm.bbclass |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
meta/classes/package_rpm.bbclass +8 -1
index b6d76e7..34cf904 100644
@@ -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
Signature · 1 line
1.7.10.4