bitbake.conf/utils: Drop some OVERRIDES from FILESPATH

PATCH New Richard Purdie 1 participant 1 message Dec 7, 2012

Share & tools

Richard Purdie

author

2012-12-07 17:53 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

meta/classes/utils.bbclass +1 -1

index c1de2f6..be0a25a 100644
@@ -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:

meta/conf/bitbake.conf +2 -0

index 420bdfa..be3bfc2 100644
@@ -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"