summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-21 17:11:48 -0700
committerChris Larson <chris_larson@mentor.com>2010-06-10 11:35:01 -0700
commit29e61b1d387b8e7b5bba8cbcbb9cfb2e2954ab68 (patch)
tree35476508f7778ad019c2c3da347612062a62e98a
parent9004bd8f2ee251308a21b8bdb35f070d349266d0 (diff)
bitbake.conf: don't filter out nonexisting paths from FILESPATH
It's unnecessary, and can cause problems with amend.bbclass. Signed-off-by: Chris Larson <chris_larson@mentor.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 ee93cd485b..5dc6772c00 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -272,7 +272,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([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))])}"
+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(':')])}"
FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}"
##################################################################