diff options
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 14 |
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 |