From: Maxim Uvarov Date: Fri, 17 Jan 2020 21:46:12 +0000 (+0300) Subject: wic: fix images build in parallel X-Git-Tag: uninative-2.8~501 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c68d8a37ba4348fe1c0e75c63b5668187d326ec2;p=openembedded-core.git wic: fix images build in parallel OE wic plugins create temporary file with the index of the line tmp file name. This causes race in case several builds run in time. If source_params['file'] is an absolute path, the cr_workdir prefix is not applied by os.path.join(). So instead it writes to a ".1" file next to the original image - this is outside the WORKDIR and at risk of collision. Signed-off-by: Maxim Uvarov Suggested-by: Ilias Apalodimas Suggested-by: Paul Barker Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 82970ce51b..3c4997d8ba 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -57,7 +57,7 @@ class RawCopyPlugin(SourcePlugin): raise WicError("No file specified") src = os.path.join(kernel_dir, source_params['file']) - dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno)) + dst = os.path.join(cr_workdir, "%s.%s" % (os.path.basename(source_params['file']), part.lineno)) if not os.path.exists(os.path.dirname(dst)): os.makedirs(os.path.dirname(dst))