aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-03-16 17:50:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 22:57:55 +0000
commitd36699b28c661880957d744420df9e23cdd76957 (patch)
tree319e269ed51ab6e0ef9cc67e015566b0ffe555e3 /scripts
parent753daf14da4017cd5d245f1587ca44faa39784f5 (diff)
downloadopenembedded-core-contrib-d36699b28c661880957d744420df9e23cdd76957.tar.gz
devtool: change config symlink name to .config.new
Otherwise (if the symlink is named .config) kernel build considers source tree as dirty and fails. [YOCTO #9270] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index b344001298..7600a8fa1f 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -783,7 +783,7 @@ def modify(args, config, basepath, workspace):
'do_fetch do_unpack do_patch do_kernel_configme do_kernel_configcheck"\n')
f.write('\ndo_configure_append() {\n'
' cp ${B}/.config ${S}/.config.baseline\n'
- ' ln -sfT ${B}/.config ${S}/.config\n'
+ ' ln -sfT ${B}/.config ${S}/.config.new\n'
'}\n')
if initial_rev:
f.write('\n# initial_rev: %s\n' % initial_rev)
@@ -930,7 +930,7 @@ def _create_kconfig_diff(srctree, rd, outfile):
"""Create a kconfig fragment"""
# Only update config fragment if both config files exist
orig_config = os.path.join(srctree, '.config.baseline')
- new_config = os.path.join(srctree, '.config')
+ new_config = os.path.join(srctree, '.config.new')
if os.path.exists(orig_config) and os.path.exists(new_config):
cmd = ['diff', '--new-line-format=%L', '--old-line-format=',
'--unchanged-line-format=', orig_config, new_config]