summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/standard.py
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-02-18 16:18:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:32:58 +0000
commit2fbd1d77bdcecde9afab25cdb367c9a8f8f22205 (patch)
treed515af70f832d786c15ed7e4a369937872970305 /scripts/lib/devtool/standard.py
parent26f951b99d075be0be27ad6ecee0a48737c28140 (diff)
downloadpoky-2fbd1d77bdcecde9afab25cdb367c9a8f8f22205.tar.gz
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>
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r--scripts/lib/devtool/standard.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index daf18c9318..ad2c4f7235 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -577,12 +577,12 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d):
577 577
578 bb.process.run('git tag -f devtool-patched', cwd=srcsubdir) 578 bb.process.run('git tag -f devtool-patched', cwd=srcsubdir)
579 579
580 kconfig = None
580 if bb.data.inherits_class('kernel-yocto', d): 581 if bb.data.inherits_class('kernel-yocto', d):
581 # Store generate and store kernel config 582 # Store generate and store kernel config
582 logger.info('Generating kernel config') 583 logger.info('Generating kernel config')
583 task_executor.exec_func('do_configure', False) 584 task_executor.exec_func('do_configure', False)
584 kconfig = os.path.join(crd.getVar('B', True), '.config') 585 kconfig = os.path.join(crd.getVar('B', True), '.config')
585 shutil.copy2(kconfig, srcsubdir)
586 586
587 587
588 tempdir_localdir = os.path.join(tempdir, 'oe-local-files') 588 tempdir_localdir = os.path.join(tempdir, 'oe-local-files')
@@ -614,6 +614,10 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d):
614 614
615 shutil.move(srcsubdir, srctree) 615 shutil.move(srcsubdir, srctree)
616 616
617 if kconfig:
618 logger.info('Copying kernel config to srctree')
619 shutil.copy2(kconfig, srctree)
620
617 finally: 621 finally:
618 bb.logger.setLevel(origlevel) 622 bb.logger.setLevel(origlevel)
619 623