Patchwork base.bbclass: Drop P and PN from FILESPATH

login
mail settings
Submitter Richard Purdie
Date Nov. 19, 2012, 11:43 p.m.
Message ID <1353368610.3709.211.camel@ted>
Download mbox | patch
Permalink /patch/39297/
State Accepted
Commit fb359583b659cda643973fa285002aaffb729a51
Headers show

Comments

Richard Purdie - Nov. 19, 2012, 11:43 p.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

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))}"