diff options
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r-- | conf/bitbake.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 68301bc478..7954b8deec 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -231,9 +231,11 @@ FILES_${PN}-locale = "${datadir}/locale" export MANIFEST = "${FILESDIR}/manifest" +# file:// search paths FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" -FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" +FILESPATHBASE = "${FILE_DIRNAME}" +FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." +FILESPATH = "${@':'.join(['%s/%s/%s' % (fp, p, o) for fp in d.getVar('FILESPATHBASE', 0).split(':') for p in d.getVar('FILESPATHPKG', 0).split(':') for o in (d.getVar('OVERRIDES', 0) + ':.').split(':')])}:${FILESDIR}" ################################################################## # General work and output directories for the build system. |