diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-25 16:09:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-26 09:25:51 +0100 |
| commit | de6e0f3af5e858960676ea291036e59105fd806f (patch) | |
| tree | 993e80a8deb50a802fe92c9ab14e789ae7dd4df2 /scripts/lib/devtool | |
| parent | 91d76e632336d6af96f24bcf92be25f41a216856 (diff) | |
| download | openembedded-core-de6e0f3af5e858960676ea291036e59105fd806f.tar.gz openembedded-core-de6e0f3af5e858960676ea291036e59105fd806f.tar.bz2 openembedded-core-de6e0f3af5e858960676ea291036e59105fd806f.zip | |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 3 |
1 files changed, 2 insertions, 1 deletions
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): |