summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-04-21 15:30:35 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:43:32 +0100
commit5b629a962d05aa1ae9d017058d078476d3675850 (patch)
treeed230390734d4d8aa39c74734dbd6105cb177ab7 /scripts/lib/devtool
parente9bae506e520a47e797c405a76f330d041289918 (diff)
downloadpoky-5b629a962d05aa1ae9d017058d078476d3675850.tar.gz
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] (From OE-Core rev: b7ab82485e4514e07ab8a76e554da27ddc92e6c0) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r--scripts/lib/devtool/standard.py9
1 files changed, 7 insertions, 2 deletions
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):
558 if not os.path.exists(appendpath): 558 if not os.path.exists(appendpath):
559 os.makedirs(appendpath) 559 os.makedirs(appendpath)
560 with open(appendfile, 'w') as f: 560 with open(appendfile, 'w') as f:
561 f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n\n') 561 f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n')
562 f.write('inherit externalsrc\n') 562 # Local files can be modified/tracked in separate subdir under srctree
563 # Mostly useful for packages with S != WORKDIR
564 f.write('FILESPATH_prepend := "%s:"\n' %
565 os.path.join(srctree, 'local-files'))
566
567 f.write('\ninherit externalsrc\n')
563 f.write('# NOTE: We use pn- overrides here to avoid affecting multiple variants in the case where the recipe uses BBCLASSEXTEND\n') 568 f.write('# NOTE: We use pn- overrides here to avoid affecting multiple variants in the case where the recipe uses BBCLASSEXTEND\n')
564 f.write('EXTERNALSRC_pn-%s = "%s"\n' % (args.recipename, srctree)) 569 f.write('EXTERNALSRC_pn-%s = "%s"\n' % (args.recipename, srctree))
565 570