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.lehto...@linux.intel.com>
---
meta/classes/externalsrc.bbclass | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index dff6184..da7eb478 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'
--
2.6.2
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
