Patchwork bitbake.conf: Drop obsolete FILESDIR setting

login
mail settings
Submitter Richard Purdie
Date Nov. 19, 2012, 11:39 p.m.
Message ID <1353368352.3709.205.camel@ted>
Download mbox | patch
Permalink /patch/39289/
State Accepted
Commit 3bb5c6bd51c91ada7fc17451627b8954dbe9c09c
Headers show

Comments

Richard Purdie - Nov. 19, 2012, 11:39 p.m.
FILESPATH is the preferred way of finding files now. Having a value
for FILESDIR which defaults to paths which will have already been
searched is pointless at best. This is the final step in letting
us drop FILESDIR support entirely from bitbake at some future date.

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

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 450a0ee..7c939f5 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -319,7 +319,6 @@  FILES_${PN}-locale = "${datadir}/locale"
 FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}"
 # FILESPATH is set in base.bbclass
 #FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
-FILESDIR = "${@bb.which(d.getVar('FILESPATH', True), '.')}"
 
 ##################################################################
 # General work and output directories for the build system.