summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-12-03 15:54:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 10:23:01 +0000
commit42ce9b8751fc68bccbd07168071f13c7fa99eda4 (patch)
tree9743eede62617569c34855eb74f2155e97cd1aa2
parent45a2977b83ff8f968d6ccfc5135dccffbe12c95e (diff)
downloadpoky-42ce9b8751fc68bccbd07168071f13c7fa99eda4.tar.gz
devtool: extract: copy kernel config to srctree
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) (From OE-Core rev: 32593f2b6a44a7bfdab55aec7e172476020fd4eb) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 5464d7b1f2..1437e7c52a 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -435,6 +435,12 @@ def _extract_source(srctree, keep_temp, devbranch, d):
435 logger.info('Adding local source files to srctree...') 435 logger.info('Adding local source files to srctree...')
436 shutil.move(os.path.join(tempdir, 'oe-local-files'), srcsubdir) 436 shutil.move(os.path.join(tempdir, 'oe-local-files'), srcsubdir)
437 437
438 if bb.data.inherits_class('kernel-yocto', d):
439 # Store generate and store kernel config
440 logger.info('Generating kernel config')
441 task_executor.exec_func('do_configure', False)
442 kconfig = os.path.join(d.getVar('B', True), '.config')
443 shutil.copy2(kconfig, srcsubdir)
438 444
439 shutil.move(srcsubdir, srctree) 445 shutil.move(srcsubdir, srctree)
440 finally: 446 finally: