Skip to contentSkip to conversation

bitbake.conf: Don't remove nonexisting paths from FILESPATH

PATCH New Chris Larson 1 participant 1 message Apr 22, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bitbake.conf: Don't remove nonexisting paths from FILESPATH

From: clarson <clarson@6a149ff2-cb3c-0410-b4c8-c88968701766>

Doing so coupled with amend.bbclass results in caching an __depends which doesn't include all possible amend.inc files, only all the possible amend.inc files *within already existing directories*. Leaving all the possible dirs in FILESPATH resolves this.

git-svn-id: http://svr-alm-svn-01.alm.mentorg.com:8080/svn/ea/easi_oe/system-builder/release-2010.1@2828 6a149ff2-cb3c-0410-b4c8-c88968701766

---
 sb-core/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sb-core/conf/bitbake.conf +1 -1
index 9a04292..bd57581 100644
@@ -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.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), '.')}"
 
 ##################################################################
Signature · 1 line
1.6.3.3