From 2a0d7aded81330e644ac766249aca06b63c3905c Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Wed, 12 Sep 2012 14:58:18 +0300 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'meta/classes/patch.bbclass') diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index a724972821..d01043807b 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -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" -- cgit v1.2.3-54-g00ecf