CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

multilib.bbclass: replace deprecated e.data with d

Browse Source 
Replace deprecated e.data with d in multilib.bbclass and
multilib_global.bbclass.

Remove event check in function multilib_virtclass_handler_vendor in
multilib_global.bbclass. The function flag 'eventmask' has been set
with 'bb.event.ConfigParsed', so no need to check the event any more.

(From OE-Core rev: 01a84c3db74e8cc4923016c312a484a252fcfee0)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8d87662d676a2b9ef921cb49ea6edc07b37410e2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Kai Kang 2024-06-05 09:37:19 +08:00 committed by Steve Sakoman
parent a9517d232e
commit 901b78e8ff
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
meta/classes/multilib.bbclass
View File

@ -5,30 +5,30 @@
#
python multilib_virtclass_handler () {
cls = e.data.getVar("BBEXTENDCURR")
variant = e.data.getVar("BBEXTENDVARIANT")
cls = d.getVar("BBEXTENDCURR")
variant = d.getVar("BBEXTENDVARIANT")
if cls != "multilib" or not variant:
return
localdata = bb.data.createCopy(e.data)
localdata = bb.data.createCopy(d)
localdata.delVar('TMPDIR')
e.data.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR'))
d.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR'))
# There should only be one kernel in multilib configs
# We also skip multilib setup for module packages.
provides = (e.data.getVar("PROVIDES") or "").split()
provides = (d.getVar("PROVIDES") or "").split()
non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split()
bpn = e.data.getVar("BPN")
if "virtual/kernel" in provides or \
bb.data.inherits_class('module-base', e.data) or \
bpn in non_ml_recipes:
bpn = d.getVar("BPN")
if ("virtual/kernel" in provides
or bb.data.inherits_class('module-base', d)
or bpn in non_ml_recipes):
raise bb.parse.SkipRecipe("We shouldn't have multilib variants for %s" % bpn)
save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or ""
save_var_name = d.getVar("MULTILIB_SAVE_VARNAME") or ""
for name in save_var_name.split():
val=e.data.getVar(name)
val = d.getVar(name)
if val:
e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
d.setVar(name + "_MULTILIB_ORIGINAL", val)
# We nearly don't need this but dependencies on NON_MULTILIB_RECIPES don't work without it
d.setVar("SSTATE_ARCHS_TUNEPKG", "${@all_multilib_tune_values(d, 'TUNE_PKGARCH')}")
@ -36,66 +36,67 @@ python multilib_virtclass_handler () {
overrides = e.data.getVar("OVERRIDES", False)
pn = e.data.getVar("PN", False)
overrides = overrides.replace("pn-${PN}", "pn-${PN}:pn-" + pn)
e.data.setVar("OVERRIDES", overrides)
d.setVar("OVERRIDES", overrides)
if bb.data.inherits_class('image', e.data):
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT'))
if bb.data.inherits_class('image', d):
d.setVar("MLPREFIX", variant + "-")
d.setVar("PN", variant + "-" + d.getVar("PN", False))
d.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT'))
override = ":virtclass-multilib-" + variant
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
target_vendor = e.data.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False)
d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override)
target_vendor = d.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False)
if target_vendor:
e.data.setVar("TARGET_VENDOR", target_vendor)
d.setVar("TARGET_VENDOR", target_vendor)
return
if bb.data.inherits_class('cross-canadian', e.data):
if bb.data.inherits_class('cross-canadian', d):
# Multilib cross-candian should use the same nativesdk sysroot without MLPREFIX
e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot")
e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot")
e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot")
e.data.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant)
e.data.setVar("MLPREFIX", variant + "-")
d.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot")
d.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot")
d.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot")
d.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant)
d.setVar("MLPREFIX", variant + "-")
override = ":virtclass-multilib-" + variant
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override)
return
if bb.data.inherits_class('native', e.data):
if bb.data.inherits_class('native', d):
raise bb.parse.SkipRecipe("We can't extend native recipes")
if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d):
raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \
and not bb.data.inherits_class('packagegroup', e.data):
if (bb.data.inherits_class('allarch', d)
and not d.getVar('MULTILIB_VARIANTS')
and not bb.data.inherits_class('packagegroup', d)):
raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
# Expand this since this won't work correctly once we set a multilib into place
e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS"))
d.setVar("ALL_MULTILIB_PACKAGE_ARCHS", d.getVar("ALL_MULTILIB_PACKAGE_ARCHS"))
override = ":virtclass-multilib-" + variant
skip_msg = e.data.getVarFlag('SKIP_RECIPE', e.data.getVar('PN'))
skip_msg = d.getVarFlag('SKIP_RECIPE', d.getVar('PN'))
if skip_msg:
pn_new = variant + "-" + e.data.getVar('PN')
if not e.data.getVarFlag('SKIP_RECIPE', pn_new):
e.data.setVarFlag('SKIP_RECIPE', pn_new, skip_msg)
pn_new = variant + "-" + d.getVar('PN')
if not d.getVarFlag('SKIP_RECIPE', pn_new):
d.setVarFlag('SKIP_RECIPE', pn_new, skip_msg)
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
d.setVar("MLPREFIX", variant + "-")
d.setVar("PN", variant + "-" + d.getVar("PN", False))
d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override)
# Expand INCOMPATIBLE_LICENSE_EXCEPTIONS with multilib prefix
pkgs = e.data.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS")
pkgs = d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS")
if pkgs:
for pkg in pkgs.split():
pkgs += " " + variant + "-" + pkg
e.data.setVar("INCOMPATIBLE_LICENSE_EXCEPTIONS", pkgs)
d.setVar("INCOMPATIBLE_LICENSE_EXCEPTIONS", pkgs)
# DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data
newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False)
newtune = d.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False)
if newtune:
e.data.setVar("DEFAULTTUNE", newtune)
d.setVar("DEFAULTTUNE", newtune)
}
addhandler multilib_virtclass_handler

25
meta/classes/multilib_global.bbclass
View File

@ -171,24 +171,23 @@ def preferred_ml_updates(d):
d.appendVar("SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS", " " + " ".join(extras))
python multilib_virtclass_handler_vendor () {
if isinstance(e, bb.event.ConfigParsed):
for v in e.data.getVar("MULTILIB_VARIANTS").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)
preferred_ml_updates(e.data)
for v in d.getVar("MULTILIB_VARIANTS").split():
if d.getVar("TARGET_VENDOR:virtclass-multilib-" + v, False) is None:
d.setVar("TARGET_VENDOR:virtclass-multilib-" + v, d.getVar("TARGET_VENDOR", False) + "ml" + v)
preferred_ml_updates(d)
}
addhandler multilib_virtclass_handler_vendor
multilib_virtclass_handler_vendor[eventmask] = "bb.event.ConfigParsed"
python multilib_virtclass_handler_global () {
variant = e.data.getVar("BBEXTENDVARIANT")
variant = d.getVar("BBEXTENDVARIANT")
if variant:
return
non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split()
if bb.data.inherits_class('kernel', e.data) or \
bb.data.inherits_class('module-base', e.data) or \
if bb.data.inherits_class('kernel', d) or \
bb.data.inherits_class('module-base', d) or \
d.getVar('BPN') in non_ml_recipes:
# We need to avoid expanding KERNEL_VERSION which we can do by deleting it
@ -197,7 +196,7 @@ python multilib_virtclass_handler_global () {
localdata.delVar("KERNEL_VERSION")
localdata.delVar("KERNEL_VERSION_PKG_NAME")
variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
variants = (d.getVar("MULTILIB_VARIANTS") or "").split()
import oe.classextend
clsextends = []
@ -208,22 +207,22 @@ python multilib_virtclass_handler_global () {
origprovs = provs = localdata.getVar("PROVIDES") or ""
for clsextend in clsextends:
provs = provs + " " + clsextend.map_variable("PROVIDES", setvar=False)
e.data.setVar("PROVIDES", provs)
d.setVar("PROVIDES", provs)
# Process RPROVIDES
origrprovs = rprovs = localdata.getVar("RPROVIDES") or ""
for clsextend in clsextends:
rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False)
if rprovs.strip():
e.data.setVar("RPROVIDES", rprovs)
d.setVar("RPROVIDES", rprovs)
# Process RPROVIDES:${PN}...
for pkg in (e.data.getVar("PACKAGES") or "").split():
for pkg in (d.getVar("PACKAGES") or "").split():
origrprovs = rprovs = localdata.getVar("RPROVIDES:%s" % pkg) 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)
d.setVar("RPROVIDES:%s" % pkg, rprovs)
}
addhandler multilib_virtclass_handler_global