diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-03-16 17:50:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:27 +0000 |
commit | 51464e7b896e55c28b4cc4074c3492cc56d50c52 (patch) | |
tree | 59055dac66dd216770b170d717923c66ebeb04e7 | |
parent | 8c0148f7b9d8532bbefbef7cc0495f879f4d12c4 (diff) | |
download | poky-51464e7b896e55c28b4cc4074c3492cc56d50c52.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]
(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>
-rw-r--r-- | scripts/lib/devtool/standard.py | 4 |
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): | |||
783 | 'do_fetch do_unpack do_patch do_kernel_configme do_kernel_configcheck"\n') | 783 | 'do_fetch do_unpack do_patch do_kernel_configme do_kernel_configcheck"\n') |
784 | f.write('\ndo_configure_append() {\n' | 784 | f.write('\ndo_configure_append() {\n' |
785 | ' cp ${B}/.config ${S}/.config.baseline\n' | 785 | ' cp ${B}/.config ${S}/.config.baseline\n' |
786 | ' ln -sfT ${B}/.config ${S}/.config\n' | 786 | ' ln -sfT ${B}/.config ${S}/.config.new\n' |
787 | '}\n') | 787 | '}\n') |
788 | if initial_rev: | 788 | if initial_rev: |
789 | f.write('\n# initial_rev: %s\n' % initial_rev) | 789 | f.write('\n# initial_rev: %s\n' % initial_rev) |
@@ -930,7 +930,7 @@ def _create_kconfig_diff(srctree, rd, outfile): | |||
930 | """Create a kconfig fragment""" | 930 | """Create a kconfig fragment""" |
931 | # Only update config fragment if both config files exist | 931 | # Only update config fragment if both config files exist |
932 | orig_config = os.path.join(srctree, '.config.baseline') | 932 | orig_config = os.path.join(srctree, '.config.baseline') |
933 | new_config = os.path.join(srctree, '.config') | 933 | new_config = os.path.join(srctree, '.config.new') |
934 | if os.path.exists(orig_config) and os.path.exists(new_config): | 934 | if os.path.exists(orig_config) and os.path.exists(new_config): |
935 | cmd = ['diff', '--new-line-format=%L', '--old-line-format=', | 935 | cmd = ['diff', '--new-line-format=%L', '--old-line-format=', |
936 | '--unchanged-line-format=', orig_config, new_config] | 936 | '--unchanged-line-format=', orig_config, new_config] |