summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-03-18 11:56:30 -0700
committerChris Larson <clarson@kergoth.com>2009-03-21 20:39:07 -0700
commitcca2065fe51746581e17a0dce3acab9a91196fc6 (patch)
treec96f10115c09fcab6dfa895a0da43e48e127da8c
parent99146d8043a5aed5d0d09fa9dad5271cffdd8f5d (diff)
bitbake.conf: Make FILESPATH only contain directories that actually exist.
Signed-off-by: Chris Larson <clarson@mvista.com>
-rw-r--r--conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
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.