lib/devtool/standard: Fix patch cleanup

PATCH New Richard Purdie 1 participant 1 message Jun 25, 2015

Share & tools

Richard Purdie

author

2015-06-25 15:09 UTC #0 lore raw

PATCH 1/1 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]

Signed-off-by Richard Purdie <[email protected]>

scripts/lib/devtool/standard.py +2 -1

index 4d3ff02..ea21877 100644
@@ -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):