1674541ed8
- skip the non-packagegroup allarch recipes in multilib_virtclass_handler
- extend PROVIDES/RPROVIDES for allarch recipes which are not packagegroups
- use variants from MULTILIB_GLOBAL_VARIANTS (lib32 lib64 libx32) to create
additional pkgdata files for multilib allarch: ${pkgdatadir}/${variant}-${PN}
and ${pkgdatadir}/runtime/${variant}-${pkg}
- use variants from MULTILIB_VARIANTS to create additional pkgdata files
for multilib kernel/module-base recipes
- add a sanity check to determine if the current multilib is in
MULTILIB_GLOBAL_VARIANTS
[YOCTO #2918]
[YOCTO #3440]
[YOCTO #3565]
[YOCTO #3568]
(From OE-Core rev: bc4da2573dfb59ea2fc4af359701818df20f7663)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
47 lines
2.1 KiB
Text
47 lines
2.1 KiB
Text
python multilib_virtclass_handler_global () {
|
|
if not e.data:
|
|
return
|
|
|
|
if isinstance(e, bb.event.RecipePreFinalise):
|
|
for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
|
|
if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
|
|
e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
|
|
|
|
variant = e.data.getVar("BBEXTENDVARIANT", True)
|
|
|
|
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) and\
|
|
not bb.data.inherits_class('packagegroup', 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 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 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 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
|
|
|