Hi,
On 14/03/16 22:43, "Paul Eggleton" <[email protected] on behalf of [email protected]> wrote: >From: Markus Lehtonen <[email protected]> > >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 <[email protected]> >Signed-off-by: Ross Burton <[email protected]> >Signed-off-by: Paul Eggleton <[email protected]> >Signed-off-by: Richard Purdie <[email protected]> >--- > 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(?) Thanks, Markus >+ if bb.data.inherits_class('kernel-yocto', d): >+ # Store generate and store kernel config >+ logger.info('Generating kernel config') >+ task_executor.exec_func('do_configure', False) >+ kconfig = os.path.join(d.getVar('B', True), '.config') >+ shutil.copy2(kconfig, srcsubdir) > > shutil.move(srcsubdir, srctree) > finally: -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
