From e8c50a2b7fe229cde8f00896ec7e908b280215ec Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Jun 2015 16:09:14 +0100 Subject: lib/devtool/standard: Fix patch cleanup If patches fail to apply with git, quilt it used as a fallback. If that happens, the code in this class is meant to handle cleanup of these patch files. In the case where ${S} is a subdir of the git tree, the code doesn't correctly set the patches directory. This change correctly sets the patches directory (which is different to the location of the git repository). [YOCTO #7911] (From OE-Core rev: de6e0f3af5e858960676ea291036e59105fd806f) Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 4d3ff02be8..ea21877b18 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -299,6 +299,7 @@ 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 @@ -319,7 +320,7 @@ def _extract_source(srctree, keep_temp, devbranch, d): scriptutils.git_convert_standalone_clone(srcsubdir) - patchdir = os.path.join(srcsubdir, 'patches') + patchdir = os.path.join(patchsubdir, 'patches') haspatches = False if os.path.exists(patchdir): if os.listdir(patchdir): -- cgit v1.2.3-54-g00ecf