summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-08-03 22:53:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-17 15:14:55 +0100
commit4219debe9ddbd0ea6d814d9d4c535c7e5b217b34 (patch)
treec3fca8c38f4db22a186e49aba12f669456703b85 /meta/classes
parentc228ffb3f10c97456cacb4f071269decbda5b88f (diff)
downloadpoky-4219debe9ddbd0ea6d814d9d4c535c7e5b217b34.tar.gz
package_rpm: Fix package rename issue in multilib case
do_package task will write information into pkgdata and do_package_write_rpm will read them out. Take lib32-dates as an example, one of its RDEPENDS is li32-gtk+, and PKG_lib32-gtk+ = "libgtk-2.0", these info is stored at: tmp/pkgdata/x86_64-pokymllib32-linux/runtime/lib32-dates. Function "mapping_rename_hook" in do_package_write_rpm is to handle those renamed packages. However before it executes, translate_vers has stripped the multilib prefix out, making it failed to find PKG_gtk+ value in pkgdata. This commit moves the strip_multilib out of translate_vers and call it after "mapping_rename_hook". [YOCTO #1368] CC: Mark Hatle <mark.hatle@windriver.com> (From OE-Core rev: 216a1cfe7973e99e3e79585040e91f7a6e298884) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_rpm.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 7a0c6daae1..9ef1acd475 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -394,7 +394,7 @@ python write_specfile () {
394 pv = subd['PKGV'] 394 pv = subd['PKGV']
395 reppv = pv.replace('-', '+') 395 reppv = pv.replace('-', '+')
396 ver = ver.replace(pv, reppv) 396 ver = ver.replace(pv, reppv)
397 newdeps_dict[strip_multilib(dep, d)] = ver 397 newdeps_dict[dep] = ver
398 depends = bb.utils.join_deps(newdeps_dict) 398 depends = bb.utils.join_deps(newdeps_dict)
399 bb.data.setVar(varname, depends.strip(), d) 399 bb.data.setVar(varname, depends.strip(), d)
400 400
@@ -516,12 +516,12 @@ python write_specfile () {
516 # Map the dependencies into their final form 516 # Map the dependencies into their final form
517 bb.build.exec_func("mapping_rename_hook", localdata) 517 bb.build.exec_func("mapping_rename_hook", localdata)
518 518
519 splitrdepends = bb.data.getVar('RDEPENDS', localdata, True) or "" 519 splitrdepends = strip_multilib(bb.data.getVar('RDEPENDS', localdata, True), d) or ""
520 splitrrecommends = bb.data.getVar('RRECOMMENDS', localdata, True) or "" 520 splitrrecommends = strip_multilib(bb.data.getVar('RRECOMMENDS', localdata, True), d) or ""
521 splitrsuggests = bb.data.getVar('RSUGGESTS', localdata, True) or "" 521 splitrsuggests = strip_multilib(bb.data.getVar('RSUGGESTS', localdata, True), d) or ""
522 splitrprovides = bb.data.getVar('RPROVIDES', localdata, True) or "" 522 splitrprovides = strip_multilib(bb.data.getVar('RPROVIDES', localdata, True), d) or ""
523 splitrreplaces = bb.data.getVar('RREPLACES', localdata, True) or "" 523 splitrreplaces = strip_multilib(bb.data.getVar('RREPLACES', localdata, True), d) or ""
524 splitrconflicts = bb.data.getVar('RCONFLICTS', localdata, True) or "" 524 splitrconflicts = strip_multilib(bb.data.getVar('RCONFLICTS', localdata, True), d) or ""
525 splitrobsoletes = [] 525 splitrobsoletes = []
526 526
527 # For now we need to manually supplement RPROVIDES with any update-alternatives links 527 # For now we need to manually supplement RPROVIDES with any update-alternatives links