Improve FILESPATH usage in .bbappend recipes

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-10-05 10:06:11 +01:00
parent 0ee7a9e6bd
commit 904ae4a753
2 changed files with 7 additions and 3 deletions

View File

@ -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"

View File

@ -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"