From: Chris Larson Date: Sat, 22 May 2010 00:11:48 +0000 (-0700) Subject: bitbake.conf: don't filter out nonexisting paths from FILESPATH X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29e61b1d387b8e7b5bba8cbcbb9cfb2e2954ab68;p=openembedded.git 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 --- 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), '.')}" ##################################################################