[OE-core] [PATCH v3 10/10] devtool: modify: make bitbake use local files from srctree

[Markus Lehtonen]

Hi,

On Wed, 2015-09-30 at 10:21 +0100, Paul Eggleton wrote:
> On Wednesday 30 September 2015 12:01:13 Markus Lehtonen wrote:
> > Hi,
> > 
> > On Mon, 2015-09-28 at 14:48 +0100, Paul Eggleton wrote:
> > > Hi Markus,
> > > 
> > > On Thursday 24 September 2015 14:53:07 Markus Lehtonen wrote:
> > > > 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 <markus.lehtonen at linux.intel.com>
> > > > ---
> > > > 
> > > >  scripts/lib/devtool/standard.py | 9 +++++++--
> > > >  1 file changed, 7 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/scripts/lib/devtool/standard.py
> > > > b/scripts/lib/devtool/standard.py index 6b85c8c..78b0d27 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'))
> > > 
> > > Shouldn't this directory be named "oe-local-files"?
> > 
> > Argh, sorry, I had missed this email earlier. Yes, it should be
> > 'oe-local-files'. An updated patch with a fix is available at:
> > 
> > http://cgit.openembedded.org/openembedded-core-contrib/log/?h=marquiz/devtoo
> > l/localfiles
> 
> OK, great, but the commit message still has "local-files".

Oh my, you're right. Yet another version of the patch in the same
location:
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=marquiz/devtool/localfiles


Thank you for your patience,
  Markus