diff options
| -rw-r--r-- | meta/classes/utils.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index c1de2f6930..be0a25a2b9 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -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: diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 420bdfa31a..be3bfc2092 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -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" |