From e8be4664313d2c617048ee99e2ef91b8594a6a6e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 19 Nov 2012 22:17:50 +0000 Subject: 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 --- meta/classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 6037f90..0ee9d2e 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -80,7 +80,7 @@ BASEDEPENDS = "${@base_dep_prepend(d)}" DEPENDS_prepend="${BASEDEPENDS} " -FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files"], d)}" +FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files"], 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(d.getVar('FILE', True))}" -- cgit v1.1