path: root/scripts/lib/devtool/
diff options
authorRichard Purdie <>2015-06-25 16:09:14 +0100
committerRichard Purdie <>2015-07-08 13:07:15 +0100
commit59774355387e11747e384b2d11864e4c95896aa3 (patch)
tree9e980e66af8184a36bb831f6392474a7557ef533 /scripts/lib/devtool/
parent5cdbf0ad06e617f49099618a36b9d15cce9b0965 (diff)
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 master rev: de6e0f3af5e858960676ea291036e59105fd806f) (From OE-Core rev: 03dbc60c165a511894d1ae10ac1d90c1fadcc268) Signed-off-by: Richard Purdie <> Signed-off-by: Joshua Lock <> Signed-off-by: Richard Purdie <>
Diffstat (limited to 'scripts/lib/devtool/')
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/devtool/ b/scripts/lib/devtool/
index d9b5d15..a459c7b 100644
--- a/scripts/lib/devtool/
+++ b/scripts/lib/devtool/
@@ -237,13 +237,14 @@ def _extract_source(srctree, keep_temp, devbranch, d):'Unpacking...')
exec_task_func('do_unpack', False)
srcsubdir = crd.getVar('S', True)
+ patchsubdir = srcsubdir
if srcsubdir != workdir and os.path.dirname(srcsubdir) != workdir:
# Handle if S is set to a subdirectory of the source
srcsubdir = os.path.join(workdir, os.path.relpath(srcsubdir, workdir).split(os.sep)[0])
- patchdir = os.path.join(srcsubdir, 'patches')
+ patchdir = os.path.join(patchsubdir, 'patches')
haspatches = False
if os.path.exists(patchdir):
if os.listdir(patchdir):
OpenPOWER on IntegriCloud