multilib: Abstract class extension code into classextend.py
(From OE-Core rev: 563828bad19a242bba9ce3db461bb5807037dfdf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0fa52f7078
commit
8e43f9a751
|
@ -37,25 +37,14 @@ STAGINGCC_prepend = "${BBEXTENDVARIANT}-"
|
||||||
python __anonymous () {
|
python __anonymous () {
|
||||||
variant = d.getVar("BBEXTENDVARIANT", True)
|
variant = d.getVar("BBEXTENDVARIANT", True)
|
||||||
|
|
||||||
def map_dependencies(varname, d, suffix = ""):
|
import oe.classextend
|
||||||
if suffix:
|
|
||||||
varname = varname + "_" + suffix
|
clsextend = oe.classextend.ClassExtender(variant, d)
|
||||||
deps = d.getVar(varname, True)
|
|
||||||
if not deps:
|
|
||||||
return
|
|
||||||
deps = bb.utils.explode_deps(deps)
|
|
||||||
newdeps = []
|
|
||||||
for dep in deps:
|
|
||||||
if dep.endswith(("-native", "-native-runtime")):
|
|
||||||
newdeps.append(dep)
|
|
||||||
else:
|
|
||||||
newdeps.append(multilib_extend_name(variant, dep))
|
|
||||||
d.setVar(varname, " ".join(newdeps))
|
|
||||||
|
|
||||||
if bb.data.inherits_class('image', d):
|
if bb.data.inherits_class('image', d):
|
||||||
map_dependencies("PACKAGE_INSTALL", d)
|
clsextend.map_depends_variable("PACKAGE_INSTALL")
|
||||||
map_dependencies("LINGUAS_INSTALL", d)
|
clsextend.map_depends_variable("LINGUAS_INSTALL")
|
||||||
map_dependencies("RDEPENDS", d)
|
clsextend.map_depends_variable("RDEPENDS")
|
||||||
pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True)
|
pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True)
|
||||||
d.setVar("PACKAGE_INSTALL", pinstall)
|
d.setVar("PACKAGE_INSTALL", pinstall)
|
||||||
d.setVar("LINGUAS_INSTALL", "")
|
d.setVar("LINGUAS_INSTALL", "")
|
||||||
|
@ -63,32 +52,13 @@ python __anonymous () {
|
||||||
d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")
|
d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")
|
||||||
return
|
return
|
||||||
|
|
||||||
pkgs_mapping = []
|
clsextend.rename_packages()
|
||||||
for pkg in (d.getVar("PACKAGES", True) or "").split():
|
clsextend.rename_package_variables((d.getVar("PACKAGEVARS", True) or "").split())
|
||||||
if pkg.startswith(variant):
|
|
||||||
pkgs_mapping.append([pkg.split(variant + "-")[1], pkg])
|
|
||||||
continue
|
|
||||||
pkgs_mapping.append([pkg, multilib_extend_name(variant, pkg)])
|
|
||||||
|
|
||||||
d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
|
clsextend.map_depends_variable("DEPENDS")
|
||||||
|
clsextend.map_packagevars()
|
||||||
vars = (d.getVar("PACKAGEVARS", True) or "").split()
|
clsextend.map_variable("PROVIDES")
|
||||||
for pkg_mapping in pkgs_mapping:
|
clsextend.map_variable("PACKAGES_DYNAMIC")
|
||||||
for subs in vars:
|
clsextend.map_variable("PACKAGE_INSTALL")
|
||||||
d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs, pkg_mapping[1]))
|
clsextend.map_variable("INITSCRIPT_PACKAGES")
|
||||||
|
|
||||||
map_dependencies("DEPENDS", d)
|
|
||||||
for pkg in (d.getVar("PACKAGES", True).split() + [""]):
|
|
||||||
map_dependencies("RDEPENDS", d, pkg)
|
|
||||||
map_dependencies("RRECOMMENDS", d, pkg)
|
|
||||||
map_dependencies("RSUGGESTS", d, pkg)
|
|
||||||
map_dependencies("RPROVIDES", d, pkg)
|
|
||||||
map_dependencies("RREPLACES", d, pkg)
|
|
||||||
map_dependencies("RCONFLICTS", d, pkg)
|
|
||||||
map_dependencies("PKG", d, pkg)
|
|
||||||
|
|
||||||
multilib_map_variable("PROVIDES", variant, d)
|
|
||||||
multilib_map_variable("PACKAGES_DYNAMIC", variant, d)
|
|
||||||
multilib_map_variable("PACKAGE_INSTALL", variant, d)
|
|
||||||
multilib_map_variable("INITSCRIPT_PACKAGES", variant, d)
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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):
|
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()
|
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
|
# Process PROVIDES
|
||||||
origprovs = provs = e.data.getVar("PROVIDES", True) or ""
|
origprovs = provs = e.data.getVar("PROVIDES", True) or ""
|
||||||
for variant in variants:
|
for clsextend in clsextends:
|
||||||
provs = provs + " " + multilib_map_variable("PROVIDES", variant, e.data)
|
provs = provs + " " + clsextend.map_variable("PROVIDES", setvar=False)
|
||||||
# Reset to original value so next time around multilib_map_variable works properly
|
|
||||||
e.data.setVar("PROVIDES", origprovs)
|
|
||||||
e.data.setVar("PROVIDES", provs)
|
e.data.setVar("PROVIDES", provs)
|
||||||
|
|
||||||
# Process RPROVIDES
|
# Process RPROVIDES
|
||||||
origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or ""
|
origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or ""
|
||||||
for variant in variants:
|
for clsextend in clsextends:
|
||||||
rprovs = rprovs + " " + multilib_map_variable("RPROVIDES", variant, e.data)
|
rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False)
|
||||||
# Reset to original value so next time around multilib_map_variable works properly
|
|
||||||
e.data.setVar("RPROVIDES", origrprovs)
|
|
||||||
e.data.setVar("RPROVIDES", rprovs)
|
e.data.setVar("RPROVIDES", rprovs)
|
||||||
|
|
||||||
# Process RPROVIDES_${PN}...
|
# Process RPROVIDES_${PN}...
|
||||||
for pkg in (e.data.getVar("PACKAGES", True) or "").split():
|
for pkg in (e.data.getVar("PACKAGES", True) or "").split():
|
||||||
origrprovs = rprovs = e.data.getVar("RPROVIDES_%s" % pkg, True) or ""
|
origrprovs = rprovs = e.data.getVar("RPROVIDES_%s" % pkg, True) or ""
|
||||||
for variant in variants:
|
for clsextend in clsextends:
|
||||||
rprovs = rprovs + " " + multilib_map_variable("RPROVIDES_%s" % pkg, variant, e.data)
|
rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES_%s" % pkg, setvar=False)
|
||||||
rprovs = rprovs + " " + variant + "-" + pkg
|
rprovs = rprovs + " " + clsextend.extname + "-" + 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)
|
e.data.setVar("RPROVIDES_%s" % pkg, rprovs)
|
||||||
}
|
}
|
||||||
|
|
||||||
addhandler multilib_virtclass_handler_global
|
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
|
|
||||||
|
|
|
@ -0,0 +1,81 @@
|
||||||
|
class ClassExtender(object):
|
||||||
|
def __init__(self, extname, d):
|
||||||
|
self.extname = extname
|
||||||
|
self.d = d
|
||||||
|
self.pkgs_mapping = []
|
||||||
|
|
||||||
|
def extend_name(self, name):
|
||||||
|
if name.startswith("kernel-module"):
|
||||||
|
return name
|
||||||
|
if name.startswith("virtual/"):
|
||||||
|
subs = name.split("/", 1)[1]
|
||||||
|
if not subs.startswith(self.extname):
|
||||||
|
return "virtual/" + self.extname + "-" + subs
|
||||||
|
return name
|
||||||
|
if not name.startswith(self.extname):
|
||||||
|
return self.extname + "-" + name
|
||||||
|
return name
|
||||||
|
|
||||||
|
def map_variable(self, varname, setvar = True):
|
||||||
|
var = self.d.getVar(varname, True)
|
||||||
|
if not var:
|
||||||
|
return ""
|
||||||
|
var = var.split()
|
||||||
|
newvar = []
|
||||||
|
for v in var:
|
||||||
|
newvar.append(self.extend_name(v))
|
||||||
|
newdata = " ".join(newvar)
|
||||||
|
if setvar:
|
||||||
|
self.d.setVar(varname, newdata)
|
||||||
|
return newdata
|
||||||
|
|
||||||
|
def map_depends(self, dep):
|
||||||
|
if dep.endswith(("-native", "-native-runtime")):
|
||||||
|
return dep
|
||||||
|
else:
|
||||||
|
return self.extend_name(dep)
|
||||||
|
|
||||||
|
def map_depends_variable(self, varname, suffix = ""):
|
||||||
|
if suffix:
|
||||||
|
varname = varname + "_" + suffix
|
||||||
|
deps = self.d.getVar(varname, True)
|
||||||
|
if not deps:
|
||||||
|
return
|
||||||
|
deps = bb.utils.explode_deps(deps)
|
||||||
|
newdeps = []
|
||||||
|
for dep in deps:
|
||||||
|
newdeps.append(self.map_depends(dep))
|
||||||
|
self.d.setVar(varname, " ".join(newdeps))
|
||||||
|
|
||||||
|
def map_packagevars(self):
|
||||||
|
for pkg in (self.d.getVar("PACKAGES", True).split() + [""]):
|
||||||
|
self.map_depends_variable("RDEPENDS", pkg)
|
||||||
|
self.map_depends_variable("RRECOMMENDS", pkg)
|
||||||
|
self.map_depends_variable("RSUGGESTS", pkg)
|
||||||
|
self.map_depends_variable("RPROVIDES", pkg)
|
||||||
|
self.map_depends_variable("RREPLACES", pkg)
|
||||||
|
self.map_depends_variable("RCONFLICTS", pkg)
|
||||||
|
self.map_depends_variable("PKG", pkg)
|
||||||
|
|
||||||
|
def rename_packages(self):
|
||||||
|
for pkg in (self.d.getVar("PACKAGES", True) or "").split():
|
||||||
|
if pkg.startswith(self.extname):
|
||||||
|
self.pkgs_mapping.append([pkg.split(self.extname + "-")[1], pkg])
|
||||||
|
continue
|
||||||
|
self.pkgs_mapping.append([pkg, self.extend_name(pkg)])
|
||||||
|
|
||||||
|
self.d.setVar("PACKAGES", " ".join([row[1] for row in self.pkgs_mapping]))
|
||||||
|
|
||||||
|
def rename_package_variables(self, variables):
|
||||||
|
for pkg_mapping in self.pkgs_mapping:
|
||||||
|
for subs in variables:
|
||||||
|
self.d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs, pkg_mapping[1]))
|
||||||
|
|
||||||
|
class NativesdkClassExtender(ClassExtender):
|
||||||
|
def map_depends(self, dep):
|
||||||
|
if dep.endswith(("-native", "-native-runtime", "-cross")):
|
||||||
|
return dep
|
||||||
|
elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")):
|
||||||
|
return dep + "-crosssdk"
|
||||||
|
else:
|
||||||
|
return self.extend_name(dep)
|
Loading…
Reference in New Issue