diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-07-14 09:04:24 +1200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:24:53 +0100 |
| commit | 92eb42c347af919cd9f8739515fdf806c12b5ba8 (patch) | |
| tree | a3b0b2afb9cddcf3bebdbc369eb6efc21e983c9e /meta | |
| parent | 5067cdc73483b53d46d9bf584723e41957c7ec54 (diff) | |
| download | openembedded-core-92eb42c347af919cd9f8739515fdf806c12b5ba8.tar.gz openembedded-core-92eb42c347af919cd9f8739515fdf806c12b5ba8.tar.bz2 openembedded-core-92eb42c347af919cd9f8739515fdf806c12b5ba8.zip | |
devtool: upgrade: record original recipe files
This provides us with the information we need to remove the original
version recipe and associated files when running "devtool finish" after
"devtool upgrade".
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/recipeutils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index cb4ed53d0f..b8d481aeb8 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -365,6 +365,7 @@ def copy_recipe_files(d, tgt_dir, whole_dir=False, download=True): # Copy local files to target directory and gather any remote files bb_dir = os.path.dirname(d.getVar('FILE', True)) + os.sep remotes = [] + copied = [] includes = [path for path in d.getVar('BBINCLUDED', True).split() if path.startswith(bb_dir) and os.path.exists(path)] for path in fetch.localpaths() + includes: @@ -376,13 +377,14 @@ def copy_recipe_files(d, tgt_dir, whole_dir=False, download=True): if not os.path.exists(subdir): os.makedirs(subdir) shutil.copy2(path, os.path.join(tgt_dir, relpath)) + copied.append(relpath) else: remotes.append(path) # Simply copy whole meta dir, if requested if whole_dir: shutil.copytree(bb_dir, tgt_dir) - return remotes + return copied, remotes def get_recipe_local_files(d, patches=False): |