* [PATCH] lib/devtool/standard: Fix patch cleanup
@ 2015-06-25 15:09 Richard Purdie
0 siblings, 0 replies; only message in thread
From: Richard Purdie @ 2015-06-25 15:09 UTC (permalink / raw
To: openembedded-core; +Cc: markus.Lehtonen, Eggleton, Paul
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>
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 4d3ff02..ea21877 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):
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-25 15:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-25 15:09 [PATCH] lib/devtool/standard: Fix patch cleanup Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.