[oe-commits] [openembedded-core] 28/82: devtool: change config symlink name to .config.new

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 2152a1137927c60bc03090d394051022600655c4
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Wed Mar 16 17:50:57 2016 +0200

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/devtool/standard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index b344001..7600a8f 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]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.