mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

lib/devtool/standard: Fix patch cleanup

Browse Source 
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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-06-25 16:09:14 +01:00
parent d85231ef14
commit e8c50a2b7f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/devtool/standard.py
+2 -1
View File
@@ -299,6 +299,7 @@ def _extract_source(srctree, keep_temp, devbranch, d):
logger.info('Unpacking...') logger.info('Unpacking...')
task_executor.exec_func('do_unpack', False) task_executor.exec_func('do_unpack', False)
srcsubdir = crd.getVar('S', True) srcsubdir = crd.getVar('S', True)
patchsubdir = srcsubdir
if srcsubdir == workdir: if srcsubdir == workdir:
# Find non-patch sources that were "unpacked" to srctree directory # Find non-patch sources that were "unpacked" to srctree directory
recipe_patches = [os.path.basename(patch) for patch in 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) scriptutils.git_convert_standalone_clone(srcsubdir)
patchdir = os.path.join(srcsubdir, 'patches') patchdir = os.path.join(patchsubdir, 'patches')
haspatches = False haspatches = False
if os.path.exists(patchdir): if os.path.exists(patchdir):
if os.listdir(patchdir): if os.listdir(patchdir):