diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-07-14 09:04:20 +1200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:24:53 +0100 |
| commit | 9230bfcc839eb35630949f0a8ed058ca1fa944b1 (patch) | |
| tree | fbce5ed9a3864e6268d475dc7a12468beaa0e0fa /scripts | |
| parent | c7a8190cf8bdf86ba850b6780b8e951e90232c06 (diff) | |
| download | openembedded-core-contrib-9230bfcc839eb35630949f0a8ed058ca1fa944b1.tar.gz | |
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@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 1ec31bcafe..e19812092e 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 |