mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-25 10:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

devtool: extract: remove patches subdirectory when S == WORKDIR

Browse Source 
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>
This commit is contained in:
Paul Eggleton
2015-08-16 11:09:32 +01:00
committed by Richard Purdie
parent 5e880674a3
commit 48bb9eca79
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/lib/devtool/standard.py
View File

@@ -301,7 +301,6 @@ 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
@@ -322,7 +321,7 @@ def _extract_source(srctree, keep_temp, devbranch, d):
scriptutils.git_convert_standalone_clone(srcsubdir)
patchdir = os.path.join(patchsubdir, 'patches')
patchdir = os.path.join(srcsubdir, 'patches')
haspatches = False
if os.path.exists(patchdir):
if os.listdir(patchdir):