sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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]

(From OE-Core rev: d36699b28c661880957d744420df9e23cdd76957)

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-03-16 17:50:57 +02:00 committed by Richard Purdie
parent 8c0148f7b9
commit 51464e7b89
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/devtool/standard.py
View File

@ -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]