Improve FILESPATH usage in .bbappend recipes

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 7 insertions, 3 deletions

diff --git a/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend b/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend
index cd5d96eb55..9bc9eed5cf 100644
--- a/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend
+++ b/meta-emenlow/packages/formfactor/formfactor_0.0.bbappend
@@ -1,4 +1,3 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+ 
 PR = "r26"
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index dd346ee8f3..a9e5657d86 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -106,6 +106,8 @@ DEPENDS_virtclass-nativesdk_prepend="${@base_dep_prepend(d)} "
 
 def base_set_filespath(path, d):
         filespath = []
+        extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split()
+        path = extrapaths + path
         # The ":" ensures we have an 'empty' override
         overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
         for p in path:
@@ -114,6 +116,9 @@ def base_set_filespath(path, d):
         return ":".join(filespath)
 
 FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
+# THISDIR only works properly with imediate expansion as it has to run
+# in the context of the location its used (:=)
+THISDIR = "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 
 SCENEFUNCS += "base_scenefunction"