mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -116,18 +116,18 @@ MACHINEOVERRIDES = ""
|
||||
PATH_prepend = "${COREBASE}/scripts/native-intercept:"
|
||||
|
||||
python native_virtclass_handler () {
|
||||
classextend = e.data.getVar('BBCLASSEXTEND', True) or ""
|
||||
classextend = e.data.getVar('BBCLASSEXTEND') or ""
|
||||
if "native" not in classextend:
|
||||
return
|
||||
|
||||
pn = e.data.getVar("PN", True)
|
||||
pn = e.data.getVar("PN")
|
||||
if not pn.endswith("-native"):
|
||||
return
|
||||
|
||||
def map_dependencies(varname, d, suffix = ""):
|
||||
if suffix:
|
||||
varname = varname + "_" + suffix
|
||||
deps = d.getVar(varname, True)
|
||||
deps = d.getVar(varname)
|
||||
if not deps:
|
||||
return
|
||||
deps = bb.utils.explode_deps(deps)
|
||||
@@ -146,14 +146,14 @@ python native_virtclass_handler () {
|
||||
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native")
|
||||
|
||||
map_dependencies("DEPENDS", e.data)
|
||||
for pkg in [e.data.getVar("PN", True), "", "${PN}"]:
|
||||
for pkg in [e.data.getVar("PN"), "", "${PN}"]:
|
||||
map_dependencies("RDEPENDS", e.data, pkg)
|
||||
map_dependencies("RRECOMMENDS", e.data, pkg)
|
||||
map_dependencies("RSUGGESTS", e.data, pkg)
|
||||
map_dependencies("RPROVIDES", e.data, pkg)
|
||||
map_dependencies("RREPLACES", e.data, pkg)
|
||||
|
||||
provides = e.data.getVar("PROVIDES", True)
|
||||
provides = e.data.getVar("PROVIDES")
|
||||
nprovides = []
|
||||
for prov in provides.split():
|
||||
if prov.find(pn) != -1:
|
||||
|
||||
Reference in New Issue
Block a user