sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: f81c641022c26a9b89fac769e0f2889eaec5d32f)

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Lehtonen 2016-04-05 16:21:49 +03:00 committed by Richard Purdie
parent f4f1d206f4
commit 43071a0d67
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/externalsrc.bbclass
View File

@ -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'