devtool: sync: update kernel config

Copy kernel config is copied to the source directory at a later phase in
_extract_source() so that it gets copied when devtool sync is done, too.

(From OE-Core rev: ff895be7a46c4b3b1b791e5387490d90bb34fce2)

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Lehtonen 2016-02-18 16:18:54 +02:00 committed by Richard Purdie
parent 26f951b99d
commit 2fbd1d77bd
1 changed files with 5 additions and 1 deletions

View File

@ -577,12 +577,12 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d):
bb.process.run('git tag -f devtool-patched', cwd=srcsubdir)
kconfig = None
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(crd.getVar('B', True), '.config')
shutil.copy2(kconfig, srcsubdir)
tempdir_localdir = os.path.join(tempdir, 'oe-local-files')
@ -614,6 +614,10 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d):
shutil.move(srcsubdir, srctree)
if kconfig:
logger.info('Copying kernel config to srctree')
shutil.copy2(kconfig, srctree)
finally:
bb.logger.setLevel(origlevel)