[oe-commits] Chris Larson : bitbake.conf: resurrect FILESDIR, didn' t intend its complete removal just yet.

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9bb0079fdb658519027cd4bfa419ddae8a39334a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9bb0079fdb658519027cd4bfa419ddae8a39334a

Author: Chris Larson <clarson at kergoth.com>
Date:   Mon Mar 23 15:59:28 2009 -0700

bitbake.conf: resurrect FILESDIR, didn't intend its complete removal just yet.

Signed-off-by: Chris Larson <clarson at kergoth.com>

---

 conf/bitbake.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 2d86f1e..7c159af 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -235,7 +235,8 @@ export MANIFEST = "${FILESDIR}/manifest"
 FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
 FILESPATHBASE = "${FILE_DIRNAME}"
 FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:."
-FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}"
+FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}"
+FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}"
 
 ##################################################################
 # General work and output directories for the build system.