diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-10-05 10:06:11 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-05 22:26:32 +0100 |
| commit | 904ae4a7531d6cb8b2cfefb7da8901b21a65ae7b (patch) | |
| tree | 7933c7458a87cab66c4b371b40bfee0854f427d5 /meta/classes/base.bbclass | |
| parent | 0ee7a9e6bdce1f3094e831b9db83087fff1dad17 (diff) | |
| download | openembedded-core-contrib-904ae4a7531d6cb8b2cfefb7da8901b21a65ae7b.tar.gz | |
Improve FILESPATH usage in .bbappend recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | meta/classes/base.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
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" |