aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-19 21:59:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-26 10:00:27 +0000
commit3efa13cd76bbd5611805021945fc9def88d9fd93 (patch)
tree947476dfcdb2d15317b34cbde81e9bc874ad9f1f
parent3bb5c6bd51c91ada7fc17451627b8954dbe9c09c (diff)
downloadopenembedded-core-contrib-3efa13cd76bbd5611805021945fc9def88d9fd93.tar.gz
bitbake.conf: Simplify FILESPATH
Files are very rarely, if ever placed in ${PF}. If a recipe needs to do this, it can easily append to FILESPATH so it makes sense to drop this from the default search path. Equally, using FILE_DIR as part of the search path leads to 'bad' SRC_URI entries and/or file layouts which are not preferred. I'm therefore of the opinion we should also remove this from FILESPATH and encourage people to cleanup any places this breaks my correcting the layouts to match the standard or worst case adding to FILESPATH in recipes that need it. These changes work towards making the system more friendly as users won't be greeted with huge search paths we rearely use making the "correct" layout more obvious. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 783b64d9de..6037f90f4b 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}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
+FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${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))}"