summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-16 11:09:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:39 +0100
commit48bb9eca790c354eb6505b02ce940398a6efa8a1 (patch)
tree338ea3c563783b4362ad2e5e09325cdde643fc58 /scripts
parent5e880674a319fe43d2cc7cc867df894483c858d5 (diff)
downloadpoky-48bb9eca790c354eb6505b02ce940398a6efa8a1.tar.gz
devtool: extract: remove patches subdirectory when S == WORKDIR
Ensure that the "patches" subdirectory is removed from the right location when S == WORKDIR (e.g. devtool extract makedevs). (From OE-Core rev: 2062c88726400e09599aff51af95799a866b90c9) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index e4ee7f7491..658076c048 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -301,7 +301,6 @@ def _extract_source(srctree, keep_temp, devbranch, d):
301 logger.info('Unpacking...') 301 logger.info('Unpacking...')
302 task_executor.exec_func('do_unpack', False) 302 task_executor.exec_func('do_unpack', False)
303 srcsubdir = crd.getVar('S', True) 303 srcsubdir = crd.getVar('S', True)
304 patchsubdir = srcsubdir
305 if srcsubdir == workdir: 304 if srcsubdir == workdir:
306 # Find non-patch sources that were "unpacked" to srctree directory 305 # Find non-patch sources that were "unpacked" to srctree directory
307 recipe_patches = [os.path.basename(patch) for patch in 306 recipe_patches = [os.path.basename(patch) for patch in
@@ -322,7 +321,7 @@ def _extract_source(srctree, keep_temp, devbranch, d):
322 321
323 scriptutils.git_convert_standalone_clone(srcsubdir) 322 scriptutils.git_convert_standalone_clone(srcsubdir)
324 323
325 patchdir = os.path.join(patchsubdir, 'patches') 324 patchdir = os.path.join(srcsubdir, 'patches')
326 haspatches = False 325 haspatches = False
327 if os.path.exists(patchdir): 326 if os.path.exists(patchdir):
328 if os.listdir(patchdir): 327 if os.listdir(patchdir):