mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

multilib: Abstract class extension code into classextend.py

Browse Source 
(From OE-Core rev: 563828bad19a242bba9ce3db461bb5807037dfdf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-12-21 13:52:46 +00:00
parent 0fa52f7078
commit 8e43f9a751
3 changed files with 107 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/multilib_global.bbclass
+12 -36
View File
@@ -8,55 +8,31 @@ python multilib_virtclass_handler_global () {
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
import oe.classextend
clsextends = []
for variant in variants:
clsextends.append(oe.classextend.ClassExtender(variant, e.data))
# Process PROVIDES
origprovs = provs = e.data.getVar("PROVIDES", True) or ""
for variant in variants:
provs = provs + " " + multilib_map_variable("PROVIDES", variant, e.data)
# Reset to original value so next time around multilib_map_variable works properly
e.data.setVar("PROVIDES", origprovs)
for clsextend in clsextends:
provs = provs + " " + clsextend.map_variable("PROVIDES", setvar=False)
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)
for clsextend in clsextends:
rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False)
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)
for clsextend in clsextends:
rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES_%s" % pkg, setvar=False)
rprovs = rprovs + " " + clsextend.extname + "-" + pkg
e.data.setVar("RPROVIDES_%s" % pkg, rprovs)
}
addhandler multilib_virtclass_handler_global
def multilib_extend_name(variant, name):
if name.startswith("kernel-module"):
return name
if name.startswith("virtual/"):
subs = name.split("/", 1)[1]
if not subs.startswith(variant):
return "virtual/" + variant + "-" + subs
return name
if not name.startswith(variant):
return variant + "-" + name
return name
def multilib_map_variable(varname, variant, d):
var = d.getVar(varname, True)
if not var:
return ""
var = var.split()
newvar = []
for v in var:
newvar.append(multilib_extend_name(variant, v))
newdata = " ".join(newvar)
d.setVar(varname, newdata)
return newdata