From: Chris Larson <clarson@mvista.com>
Date: Wed, 18 Mar 2009 18:56:30 +0000 (-0700)
Subject: bitbake.conf: Make FILESPATH only contain directories that actually exist.
X-Git-Tag: Release-2010-05/1~3796^2~53^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cca2065fe51746581e17a0dce3acab9a91196fc6;p=openembedded.git

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

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

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7a6f80f1e8..2fb6b90e1a 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.