patch.bbclass: Use one TMPDIR per patching process

We must use one TMPDIR per process (/tmp/${PID}) so that the patching
processes don't generate the same temp file name (the "patch" program
uses the TMPDIR environment variable for deciding where to create the
temp files).

[YOCTO #3070]

(From OE-Core rev: 16dbf505c4fdd9fe1820d950ab05c8ea99ad7505)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Constantin Musca
2012-09-12 14:58:18 +03:00
committed by Richard Purdie
parent d7ef15a063
commit 2a0d7aded8

View File

@@ -139,6 +139,13 @@ python patch_do_patch() {
path = os.getenv('PATH')
os.putenv('PATH', d.getVar('PATH', True))
import shutil
process_tmpdir = os.path.join('/tmp', str(os.getpid()))
if os.path.exists(process_tmpdir):
shutil.rmtree(process_tmpdir)
os.makedirs(process_tmpdir)
os.environ['TMPDIR'] = process_tmpdir
for patch in src_patches(d):
_, _, local, _, _, parm = bb.decodeurl(patch)
@@ -161,11 +168,15 @@ python patch_do_patch() {
try:
patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
except Exception as exc:
shutil.rmtree(process_tmpdir)
bb.fatal(str(exc))
try:
resolver.Resolve()
except bb.BBHandledException as e:
shutil.rmtree(process_tmpdir)
bb.fatal(str(e))
shutil.rmtree(process_tmpdir)
}
patch_do_patch[vardepsexclude] = "PATCHRESOLVE"