bitbake.conf/utils: Drop some OVERRIDES from FILESPATH

Submitted by Richard Purdie on Dec. 7, 2012, 5:38 p.m.

Details

Message ID 1354901903.12928.38.camel@ted
State Accepted
Commit f823f0a0c04d6f13359f0aac4a2946a6e4dd3649
Headers show

Commit Message

Richard Purdie Dec. 7, 2012, 5:38 p.m.
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>
---

Patch hide | download patch | download mbox

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"