[oe] [PATCH] bitbake.conf: reverse OVERRIDES order in FILESPATH definition
Martin Jansa
martin.jansa at gmail.com
Sat Oct 16 19:32:10 UTC 2010
* directories in FILESPATH are search for first fit and we would expect
ie ${PN}/local/a.patch to be used before ${PN}/ramses/a.patch
* moving last ':' before OVERRIDES makes FILESPATHBASE/FILESPATHPKG/ as
last option instead of first
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
conf/bitbake.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index edb9530..1a08673 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([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(':')[::-1]])}"
FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}"
##################################################################
--
1.7.3.1
More information about the Openembedded-devel
mailing list