[oe-commits] Richard Purdie : bitbake.conf/utils: Drop some OVERRIDES from FILESPATH

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: b8b1b39961332c99d62ee466f7859bd62a0f806f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b8b1b39961332c99d62ee466f7859bd62a0f806f

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Dec  7 17:38:23 2012 +0000

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 at linuxfoundation.org>

---

 meta/classes/utils.bbclass |    2 +-
 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 c1de2f6..be0a25a 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 420bdfa..be3bfc2 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"