[OE-core] [jethro][PATCH 1/2] devtool: extract: copy kernel config to srctree

[Paul Eggleton]

On Fri, 18 Mar 2016 10:23:22 Markus Lehtonen wrote:
> Hi,
> 
> On 14/03/16 22:43, "Paul Eggleton" <openembedded-core-
bounces at lists.openembedded.org on behalf of paul.eggleton at linux.intel.com> 
wrote:
> >From: Markus Lehtonen <markus.lehtonen at linux.intel.com>
> >
> >This makes the correct kernel config to be used when building kernel
> >from srctree (extrernalsrc). If no kernel config is present in the
> >builddir 'do_configure' task copies .config from the srctree.
> >
> >(From OE-Core master rev: 3b516332e038a587685f6e0c14a7f04990bdd6cc)
> >
> >Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
> >Signed-off-by: Ross Burton <ross.burton at intel.com>
> >Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
> >Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> >---
> >
> > scripts/lib/devtool/standard.py | 11 ++++++-----
> > 1 file changed, 6 insertions(+), 5 deletions(-)
> >
> >diff --git a/scripts/lib/devtool/standard.py
> >b/scripts/lib/devtool/standard.py index 5464d7b..c1fbfe3 100644
> >--- a/scripts/lib/devtool/standard.py
> >+++ b/scripts/lib/devtool/standard.py
> >
> >@@ -430,11 +430,12 @@ def _extract_source(srctree, keep_temp, devbranch, 
d):
> >             if haspatches:
> >                 bb.process.run('git checkout patches', cwd=srcsubdir)
> >
> >-        # Move oe-local-files directory to srctree
> >-        if os.path.exists(os.path.join(tempdir, 'oe-local-files')):
> >-            logger.info('Adding local source files to srctree...')
> >-            shutil.move(os.path.join(tempdir, 'oe-local-files'),
> >srcsubdir) -
> 
> Why are you "disabling" oe-local-files here? That's unrelated to the kernel
> config. A mistake in patch conflict resolving, perhaps(?)

Oops! Yes indeed. I've fixed this on the branch so that doesn't get removed.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre