[oe-commits] Richard Purdie : Revert "bitbake.conf: Drop obsolete FILESDIR setting"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: c3866bc2a0cd1f70cd9a90dea3f10539ca609643
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c3866bc2a0cd1f70cd9a90dea3f10539ca609643

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Nov 21 20:35:52 2012 +0000

Revert "bitbake.conf: Drop obsolete FILESDIR setting"

This reverts commit d6e5ceafcaef06b8a3f9acc2aa826a40a016f913 since
the value is clearly still being used in local file urls that are
only hit at do_unpack time.

---

 meta/conf/bitbake.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7c939f5..450a0ee 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -319,6 +319,7 @@ 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.