From: Markus Lehtonen Date: Tue, 21 Apr 2015 12:30:35 +0000 (+0300) Subject: devtool: modify: make bitbake use local files from srctree X-Git-Tag: 2015-10~227 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b7ab82485e4514e07ab8a76e554da27ddc92e6c0;p=openembedded-core.git devtool: modify: make bitbake use local files from srctree This change makes it possible to have local files (non-remote SRC_URI files, i.e. files that are located in the "recipe space") under the srctree even if S!=WORKDIR. The files must be placed under the 'local-files' subdirectory. Complements the previous patch that imports local files into srctree. [YOCTO #7602] Signed-off-by: Markus Lehtonen --- diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 0c67c131a8..20eafec052 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -558,8 +558,13 @@ def modify(args, config, basepath, workspace): if not os.path.exists(appendpath): os.makedirs(appendpath) with open(appendfile, 'w') as f: - f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n\n') - f.write('inherit externalsrc\n') + f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n') + # Local files can be modified/tracked in separate subdir under srctree + # Mostly useful for packages with S != WORKDIR + f.write('FILESPATH_prepend := "%s:"\n' % + os.path.join(srctree, 'local-files')) + + f.write('\ninherit externalsrc\n') f.write('# NOTE: We use pn- overrides here to avoid affecting multiple variants in the case where the recipe uses BBCLASSEXTEND\n') f.write('EXTERNALSRC_pn-%s = "%s"\n' % (args.recipename, srctree))