diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-19 22:17:50 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-26 10:01:23 +0000 |
| commit | e8be4664313d2c617048ee99e2ef91b8594a6a6e (patch) | |
| tree | 97cf37e85e0976e511414ce0873ba4ff8e0ce87c | |
| parent | 65145901aff919b24157e8efcf19a179e09bc46a (diff) | |
| download | poky-e8be4664313d2c617048ee99e2ef91b8594a6a6e.tar.gz | |
base.bbclass: Drop P and PN from FILESPATH
In the interests of simplifying things, remove P and PN from FILESPATH,
instead relying on the BP and BPN versions which work in 99% of cases.
In any problematic case such as a -native only recipe, either the patch
directory can be renamed or the recipe can set FILESPATH specifically.
(From OE-Core rev: fb359583b659cda643973fa285002aaffb729a51)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 6037f90f4b..0ee9d2e710 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -80,7 +80,7 @@ BASEDEPENDS = "${@base_dep_prepend(d)}" | |||
| 80 | 80 | ||
| 81 | DEPENDS_prepend="${BASEDEPENDS} " | 81 | DEPENDS_prepend="${BASEDEPENDS} " |
| 82 | 82 | ||
| 83 | FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files"], d)}" | 83 | FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files"], d)}" |
| 84 | # THISDIR only works properly with imediate expansion as it has to run | 84 | # THISDIR only works properly with imediate expansion as it has to run |
| 85 | # in the context of the location its used (:=) | 85 | # in the context of the location its used (:=) |
| 86 | THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" | 86 | THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}" |