[oe-commits] Chris Larson : bitbake.conf: don' t filter out nonexisting paths from FILESPATH

git version control git at git.openembedded.org
Thu Jun 10 18:35:15 UTC 2010


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

Author: Chris Larson <chris_larson at mentor.com>
Date:   Fri May 21 17:11:48 2010 -0700

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 at mentor.com>

---

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

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index ee93cd4..5dc6772 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), '.')}"
 
 ##################################################################





More information about the Openembedded-commits mailing list