From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 21 Nov 2012 20:35:52 +0000 (+0000)
Subject: Revert "bitbake.conf: Drop obsolete FILESDIR setting"
X-Git-Tag: 2015-4~8617
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c3866bc2a0cd1f70cd9a90dea3f10539ca609643;p=openembedded-core.git

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.
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7c939f5a4d..450a0ee1e9 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.