bitbake.conf/utils: Drop some OVERRIDES from FILESPATH
There are several overrides that don't make sense as part of FILESPATH. This introduces FILESOVERRIDES and allows us to drop some of the pointless ones, simplifying the files search path further and improving the user experience. If needed by specific recipes, other overrides can be added back in for specific cases. (From OE-Core rev: b8b1b39961332c99d62ee466f7859bd62a0f806f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a190aba525
commit
f823f0a0c0
|
@ -308,7 +308,7 @@ def base_set_filespath(path, d):
|
|||
if extrapaths != "":
|
||||
path = extrapaths.split(":") + path
|
||||
# The ":" ensures we have an 'empty' override
|
||||
overrides = ((d.getVar("OVERRIDES", True) or "") + ":").split(":")
|
||||
overrides = ((d.getVar("FILESOVERRIDES", True) or "") + ":").split(":")
|
||||
for p in path:
|
||||
if p != "":
|
||||
for o in overrides:
|
||||
|
|
|
@ -671,6 +671,8 @@ DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}"
|
|||
MACHINEOVERRIDES ?= "${MACHINE}"
|
||||
MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
|
||||
|
||||
FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}"
|
||||
|
||||
CPU_FEATURES ?= ""
|
||||
CPU_FEATURES_arm ?= "vfp"
|
||||
|
||||
|
|
Loading…
Reference in New Issue