From ff895be7a46c4b3b1b791e5387490d90bb34fce2 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 18 Feb 2016 16:18:54 +0200 Subject: 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. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/lib/devtool/standard.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') 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): 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) -- cgit 1.2.3-korg