[oe-commits] [openembedded-core] 68/118: devtool: update-recipe: don't copy local files that haven't changed

[git at git.openembedded.org]

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

commit 9230bfcc839eb35630949f0a8ed058ca1fa944b1
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Jul 14 09:04:20 2016 +1200

    devtool: update-recipe: don't copy local files that haven't changed
    
    If there are files in the oe-local-files directory which are identical
    to the original version, then we shouldn't be copying them to the
    destination layer. This is particularly important when using the -a
    option to create a bbappend.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/devtool/standard.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 1ec31bc..e198120 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -28,6 +28,7 @@ import argparse_oe
 import scriptutils
 import errno
 import glob
+import filecmp
 from collections import OrderedDict
 from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, DevtoolError
 from devtool import parse_recipe
@@ -1031,7 +1032,10 @@ def _export_local_files(srctree, rd, destdir):
     if new_set is not None:
         for fname in new_set:
             if fname in existing_files:
-                updated[fname] = existing_files.pop(fname)
+                origpath = existing_files.pop(fname)
+                workpath = os.path.join(local_files_dir, fname)
+                if not filecmp.cmp(origpath, workpath):
+                    updated[fname] = origpath
             elif fname != '.gitignore':
                 added[fname] = None
 

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