diff options
Diffstat (limited to 'scripts/lib/devtool')
| -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 | |||
| 28 | import scriptutils | 28 | import scriptutils |
| 29 | import errno | 29 | import errno |
| 30 | import glob | 30 | import glob |
| 31 | import filecmp | ||
| 31 | from collections import OrderedDict | 32 | from collections import OrderedDict |
| 32 | 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 | 33 | 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 |
| 33 | from devtool import parse_recipe | 34 | from devtool import parse_recipe |
| @@ -1031,7 +1032,10 @@ def _export_local_files(srctree, rd, destdir): | |||
| 1031 | if new_set is not None: | 1032 | if new_set is not None: |
| 1032 | for fname in new_set: | 1033 | for fname in new_set: |
| 1033 | if fname in existing_files: | 1034 | if fname in existing_files: |
| 1034 | updated[fname] = existing_files.pop(fname) | 1035 | origpath = existing_files.pop(fname) |
| 1036 | workpath = os.path.join(local_files_dir, fname) | ||
| 1037 | if not filecmp.cmp(origpath, workpath): | ||
| 1038 | updated[fname] = origpath | ||
| 1035 | elif fname != '.gitignore': | 1039 | elif fname != '.gitignore': |
| 1036 | added[fname] = None | 1040 | added[fname] = None |
| 1037 | 1041 | ||
