diff options
| -rw-r--r-- | scripts/lib/devtool/standard.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index b2e1a6ca3a..f2440ae804 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
| @@ -18,7 +18,6 @@ import argparse_oe | |||
| 18 | import scriptutils | 18 | import scriptutils |
| 19 | import errno | 19 | import errno |
| 20 | import glob | 20 | import glob |
| 21 | import filecmp | ||
| 22 | from collections import OrderedDict | 21 | from collections import OrderedDict |
| 23 | from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, update_unlockedsigs, check_prerelease_version, check_git_repo_dirty, check_git_repo_op, DevtoolError | 22 | from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, update_unlockedsigs, check_prerelease_version, check_git_repo_dirty, check_git_repo_op, DevtoolError |
| 24 | from devtool import parse_recipe | 23 | from devtool import parse_recipe |
| @@ -814,10 +813,8 @@ def modify(args, config, basepath, workspace): | |||
| 814 | staging_kbranch = get_staging_kbranch(srcdir) | 813 | staging_kbranch = get_staging_kbranch(srcdir) |
| 815 | if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): | 814 | if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): |
| 816 | oe.path.copyhardlinktree(srcdir, srctree) | 815 | oe.path.copyhardlinktree(srcdir, srctree) |
| 817 | workdir = rd.getVar('WORKDIR') | ||
| 818 | unpackdir = rd.getVar('UNPACKDIR') | 816 | unpackdir = rd.getVar('UNPACKDIR') |
| 819 | srcsubdir = rd.getVar('S') | 817 | srcsubdir = rd.getVar('S') |
| 820 | localfilesdir = os.path.join(srctree, 'oe-local-files') | ||
| 821 | 818 | ||
| 822 | # Add locally copied files to gitignore as we add back to the metadata directly | 819 | # Add locally copied files to gitignore as we add back to the metadata directly |
| 823 | local_files = oe.recipeutils.get_recipe_local_files(rd) | 820 | local_files = oe.recipeutils.get_recipe_local_files(rd) |
