aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-21 20:35:52 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2012-11-29 12:00:36 +0100
commitf6fcc0b73779f1fb3be28306b3616ae180734f72 (patch)
tree830ca803305feaf03832d5120be6050142873b10
parentd23e02ad4030618ce4141d6ddefff0879aee8095 (diff)
downloadopenembedded-core-contrib-f6fcc0b73779f1fb3be28306b3616ae180734f72.tar.gz
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.
-rw-r--r--meta/conf/bitbake.conf1
1 files changed, 1 insertions, 0 deletions
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.