diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-07 17:38:23 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-11 15:58:27 +0000 |
| commit | b8b1b39961332c99d62ee466f7859bd62a0f806f (patch) | |
| tree | 333ca4ba6a8ac29b608949a11b834fdabefbe0c6 /meta | |
| parent | 8f7bd81f4769984a5acdb40f3a76e290615c3020 (diff) | |
| download | openembedded-core-contrib-b8b1b39961332c99d62ee466f7859bd62a0f806f.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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" |