From a241106ca4a32215ecb6c079c4e6221fd5838f6f Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 16 Oct 2010 22:34:51 -0700 Subject: [PATCH] bitbake.conf: sanitize FILESPATH - reverse OVERRIDES - drop empty overrides - uniq the list - use nested variable references rather than getVar Signed-off-by: Chris Larson --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), '.')}" ################################################################## -- 2.39.5