diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-08-16 11:09:32 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-19 17:57:53 +0100 |
| commit | 2062c88726400e09599aff51af95799a866b90c9 (patch) | |
| tree | 0d9fbc0ef3b57f46fc1524bb7ad0bb9fcaf30921 /scripts | |
| parent | 5be16d639d1b78d114755bfd552ac901d0fdf4a9 (diff) | |
| download | openembedded-core-2062c88726400e09599aff51af95799a866b90c9.tar.gz openembedded-core-2062c88726400e09599aff51af95799a866b90c9.tar.bz2 openembedded-core-2062c88726400e09599aff51af95799a866b90c9.zip | |
devtool: extract: remove patches subdirectory when S == WORKDIR
Ensure that the "patches" subdirectory is removed from the right
location when S == WORKDIR (e.g. devtool extract makedevs).
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index e4ee7f7491..658076c048 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -301,7 +301,6 @@ def _extract_source(srctree, keep_temp, devbranch, d): logger.info('Unpacking...') task_executor.exec_func('do_unpack', False) srcsubdir = crd.getVar('S', True) - patchsubdir = srcsubdir if srcsubdir == workdir: # Find non-patch sources that were "unpacked" to srctree directory recipe_patches = [os.path.basename(patch) for patch in @@ -322,7 +321,7 @@ def _extract_source(srctree, keep_temp, devbranch, d): scriptutils.git_convert_standalone_clone(srcsubdir) - patchdir = os.path.join(patchsubdir, 'patches') + patchdir = os.path.join(srcsubdir, 'patches') haspatches = False if os.path.exists(patchdir): if os.listdir(patchdir): |