From 9bb0079fdb658519027cd4bfa419ddae8a39334a Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 23 Mar 2009 15:59:28 -0700 Subject: [PATCH] bitbake.conf: resurrect FILESDIR, didn't intend its complete removal just yet. Signed-off-by: Chris Larson --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 2d86f1ea07..7c159afcee 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -235,7 +235,8 @@ 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))])}:${FILESDIR}" +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))])}" +FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" ################################################################## # General work and output directories for the build system. -- 2.39.5