summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-04-05 16:21:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-05 14:37:43 +0100
commitf81c641022c26a9b89fac769e0f2889eaec5d32f (patch)
tree815bc8fb459f8451b36deda14ee2f3e27346455d
parentb2dc5a68e74dafedf7960ef77ad3d73912ed7960 (diff)
downloadopenembedded-core-contrib-f81c641022c26a9b89fac769e0f2889eaec5d32f.tar.gz
openembedded-core-contrib-f81c641022c26a9b89fac769e0f2889eaec5d32f.tar.bz2
openembedded-core-contrib-f81c641022c26a9b89fac769e0f2889eaec5d32f.zip
externalsrc: avoid race in temporary git index file
Use a unique tempfile as the temporary git index file when determining the git hash of the source tree. A fixed filename was obviously causing races (with the git index.lock file) under oe-selftest where multiple bitbake instances were run against the same source tree at the same time. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/externalsrc.bbclass17
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index dff61842f2..da7eb4781c 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -130,21 +130,22 @@ python externalsrc_compile_prefunc() {
def srctree_hash_files(d):
import shutil
import subprocess
+ import tempfile
s_dir = d.getVar('EXTERNALSRC', True)
git_dir = os.path.join(s_dir, '.git')
- oe_index_file = os.path.join(git_dir, 'oe-devtool-index')
oe_hash_file = os.path.join(git_dir, 'oe-devtool-tree-sha1')
ret = " "
if os.path.exists(git_dir):
- # Clone index
- shutil.copy2(os.path.join(git_dir, 'index'), oe_index_file)
- # Update our custom index
- env = os.environ.copy()
- env['GIT_INDEX_FILE'] = oe_index_file
- subprocess.check_output(['git', 'add', '.'], cwd=s_dir, env=env)
- sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env)
+ with tempfile.NamedTemporaryFile(dir=git_dir, prefix='oe-devtool-index') as tmp_index:
+ # Clone index
+ shutil.copy2(os.path.join(git_dir, 'index'), tmp_index.name)
+ # Update our custom index
+ env = os.environ.copy()
+ env['GIT_INDEX_FILE'] = tmp_index.name
+ subprocess.check_output(['git', 'add', '.'], cwd=s_dir, env=env)
+ sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env)
with open(oe_hash_file, 'w') as fobj:
fobj.write(sha1)
ret = oe_hash_file + ':True'