diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-10-16 22:34:51 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-10-16 22:54:11 -0700 |
| commit | a241106ca4a32215ecb6c079c4e6221fd5838f6f (patch) | |
| tree | 4e1aad3c9a15eb06d9b66b5f509f52e93e533e61 | |
| parent | 16011461a11c3408a81983b5f719e5e9da9c7ff6 (diff) | |
| download | openembedded-a241106ca4a32215ecb6c079c4e6221fd5838f6f.tar.gz | |
bitbake.conf: sanitize FILESPATH
- reverse OVERRIDES
- drop empty overrides
- uniq the list
- use nested variable references rather than getVar
Signed-off-by: Chris Larson <chris_larson@mentor.com>
| -rw-r--r-- | conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c2359dce97..c9736e077f 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -271,7 +271,7 @@ FILES_${PN}-locale = "${datadir}/locale" 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(':')])}" +FILESPATH = "${@':'.join(uniq(os.path.normpath(os.path.join(fp, p, o)) for fp in '${FILESPATHBASE}'.split(':') for p in '${FILESPATHPKG}'.split(':') for o in reversed([''] + filter(None, '${OVERRIDES}'.split(':')))))}" FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" ################################################################## |