[oe-commits] Chris Larson : bitbake.conf: Make FILESPATH only contain directories that actually exist.

[GIT User account]

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

Author: Chris Larson <clarson at mvista.com>
Date:   Wed Mar 18 11:56:30 2009 -0700

bitbake.conf: Make FILESPATH only contain directories that actually exist.

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

---

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

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7a6f80f..2fb6b90 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -235,7 +235,7 @@ 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(['%s/%s/%s' % (fp, p, o) for fp in d.getVar('FILESPATHBASE', 0).split(':') for p in d.getVar('FILESPATHPKG', 0).split(':') for o in (d.getVar('OVERRIDES', 0) + ':.').split(':')])}:${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}"
 
 ##################################################################
 # General work and output directories for the build system.