sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

multilib_global.bbclass: Fix non-multilib package provides 

In non-multilib packages, configured in a multilib configuration we
need to adjust the system provides and rprovides to include the
virtual multilib variant.

This resolves a problem introduced in the
329d864f9bbf94ad3aae8df43d63fe10e4237e4f commit.  Where "allarch"
packages were suddenly providing all variants of an object.

(From OE-Core rev: 66fa6b7e13fbcc5f75fb1b8aa3aedfbdbc148688)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2011-09-20 12:06:54 -05:00 committed by Richard Purdie
parent 87849d8420
commit a0530fc847
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
meta/classes/multilib_global.bbclass
View File

@ -6,16 +6,33 @@ python multilib_virtclass_handler_global () {
if isinstance(e, bb.event.RecipeParsed) and not variant:
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
origprovs = provs = e.data.getVar("PROVIDES", True)
rprovs = e.data.getVar("RPROVIDES", True)
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
# Process PROVIDES
origprovs = provs = e.data.getVar("PROVIDES", True) or ""
for variant in variants:
provs = provs + " " + multilib_map_variable("PROVIDES", variant, e.data)
for pkg in e.data.getVar("PACKAGES", True).split():
rprovs = rprovs + " " + variant + "-" + pkg
# Reset to original value so next time around multilib_map_variable works properly
e.data.setVar("PROVIDES", origprovs)
e.data.setVar("PROVIDES", provs)
# Process RPROVIDES
origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or ""
for variant in variants:
rprovs = rprovs + " " + multilib_map_variable("RPROVIDES", variant, e.data)
# Reset to original value so next time around multilib_map_variable works properly
e.data.setVar("RPROVIDES", origrprovs)
e.data.setVar("RPROVIDES", rprovs)
# Process RPROVIDES_${PN}...
for pkg in (e.data.getVar("PACKAGES", True) or "").split():
origrprovs = rprovs = e.data.getVar("RPROVIDES_%s" % pkg, True) or ""
for variant in variants:
rprovs = rprovs + " " + multilib_map_variable("RPROVIDES_%s" % pkg, variant, e.data)
rprovs = rprovs + " " + variant + "-" + pkg
# Reset to original value so next time around multilib_map_variable works properly
e.data.setVar("RPROVIDES_%s" % pkg, origrprovs)
e.data.setVar("RPROVIDES_%s" % pkg, rprovs)
}
addhandler multilib_virtclass_handler_global
@ -35,7 +52,7 @@ def multilib_extend_name(variant, name):
def multilib_map_variable(varname, variant, d):
var = d.getVar(varname, True)
if not var:
return
return ""
var = var.split()
newvar = []
for v in var: