From: Paul Eggleton Date: Sun, 16 Aug 2015 10:09:32 +0000 (+0100) Subject: devtool: extract: remove patches subdirectory when S == WORKDIR X-Git-Tag: 2015-10~821 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2062c88726400e09599aff51af95799a866b90c9;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- 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):